Map handler class added