Added more changed to the role_type picker