IMPORTANT - Review of Maps for 2.5 release