Added more fields to composition