Improve performance, refactor Date usage.