Changes on ParseGate and ParseMap