Added data annotations, Updated Id's to coding standard, added 6 digit instance id