Add support to the data model for roles and types