Reworking workflow for Building add

plus other changes