Update to work with composer autoloading