Updated/New Composer support for OLE

See diff for full changes