Updates to base structures