Added better support for entities with PK fields with default value expressions