Initial changes for local build