Define flex entities.
Better composer compatibility
Merge remote-tracking branch 'upstream/master'