fixed DTO usage
modularized