Changes to base role and a db stub role