Opposite feature updated but does not support collections yet.
Minor updates of Composition but does not support collections yet.
Tests updated