Massive update for usage of DTO and parsers