changes to make it work with composer