Added ability to run as non root