#6201 working on new structure type, apis, template field