Move Relation and Role back to struct
Fixes backwards compatibility for some plugins