FIx project config & use DTOs instead of integers.