Migrate to state composites

This migrates to core #287