Make additional claims configurable