Ashok | #17 | Refactoring around DTOs