Added GridSelect DTOs, consolidated duplicates