Initial support for Composer #3