Fixing role support and deploying