Cleaned up addRole code