Remove ToJSON methods and create JSON constructors