Updated package to run like a module