Better intergration with charisma and simpleuser