Grid encapsulation and enum correction