Update to match new wallbase system