Added roles
During this noticed some bugs / for instance metho-override seems to
nolonger be working