Refactoring config variables
Use the new start-date and end-date instead of date and time