General changes before totemBase rework