Embedded Composer updates

Major work on updating Embedded Composer.