[IMP] added subtype and improved template