Daily refactoring
Add monthly yearly