Added claim mapping and user service support