Integration of the shapes map and important update