Rework to work with composer.