Modified for Composer.