Added enum support for DTOs