Updated/New Composer support for Calendar

See diff for full changes