New map, new object classes