Modified templates for new API specification.