Refactor building adding with fixed gaps