More structure to support survival mode