UNSTABLE - Refactor default roles