Date changes to make it more maintainable