Removed dependency on jumpstart_roles