Switch to getattr
Merge branch 'role' into hotfix