Removed some of the JsonDSL in favor of a view model