Changed DTOs to work only with IDs.
Merge origin/master