Class MapBuilder added