Adding some features to allow dev environment access