Added composition.
Fixed validation.