#22 update the building id for differents components