Minor changes to setup, and added extra obj to pre_validate to get original object being updated (for patch)