Changes to (hopefully) be Composer compatible