Added necessary rbKeys and update attributeType values in UI