Added map capability