FIlter by date
Configuration Settings
Refactor