Construction 2

Some performance tweaks.
New DTO.
The new DTO contains 2 bugs;