Add extra onBefore/onAfter callback for Type and SubType (create, update, delete)
Merge branch 'develop'