fold roles into User model and builder