Adding support for specifying the type with compose_with
Merge branch 'master' of github.com:atomicobject/motion-objection