Switch from fixed role to more generic mapping system.