Building loading from map, removed abstract from classes not intended to
be abstract