Clean up property naming in the JSON
Adding option of explicit template typing
Support for composite templates