Updated to use unified return codes