Add custom entity_type models
Merge remote-tracking branch 'origin/master'