Added changes for local installation