Fixed date range bug
Internal changes to configuration
Refactoring bean wiring