Role support

yes, I'll wait for more review and group fixes into a single PR.