Better composer compatibility
Define flex entities.
Merge branch 'pr/3' into incoming