Updated schema
Fix for calculated role assignment issues