Grid classes refractoring