Cleaned ObjectsManager and DataMapper, added JSON