Updated/New Composer support for OpenDocument

See diff for full changes