Cleaned up some files...
Timestamp database field is now mapped as Version to match entity property
name