Exception handling restructuring.
DTO restructuring.