Add model support for helper classes
Create helper classes for diagrams