Fix up the relationships in user/role etc and add commands to allow them to be managed