updated fields to handle composer values