Move to DTO + a test list all