Added mapping for 1.8.0