More Gen VI structure additions