Cleaned up identity map. Cleaned up file structure
Resolved merge conflict
updated dynamic attribute setters and getters on model