Added ability to self-package