Changes to get working with npm