Updated classes, this is pre/regeneration state