Map to new building-2.4