Support for user defined Primary Key & soft deletes