Rework to use with composer.