#35 Change role hierarchy