Updated db schema
Updated domain tests
Changed the error handling for missing records
Merge branch 'NewStructure' into develop