Simplify default roles
Version Bump