Bug Fixes

Added Switch Role