Updated ReturnObjectImpl with a few tweaks