Adding more Map classes