Implemented claims-based config