Added DTOs for DSL metadata; fixed scoping between DTOs