Updated for compatibility with npm scoped packages