Moved up the creation of roles