[CHANGE] Preparation for element add functionality