Fixed non remote and added more dependencies

Change-Id: I9fdde8f6422cf94949ac3d46babfdc968c395af8