Fixes for DC in the new attr based implementation
Implemented from_json and save on model objects
Group operations by wrapper and re use wrappers
Merge branch with master