Got rid of the concept of multiple maps