Changed the way that persistence fields are found.
Fixed issue with auto generated IDs