Updates

- Add filter method to DTO
- Update unit tests