Add custom types and roles from procedure

Merge request reports