Updated json support
Adding domain objects in to project.