Add resource_name to Role::Basic
Clean up