Factory Switch fixed, continue DTO