Start of new render state support