support new composite and a pluggable changelist