Small changes and adding a role_prefix