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