Added dateHelper. Changed structure.