Changed Data structure

- Changed the data structure to allow for more, better options, as per
the requirements.
- OnClick event now returns the full date as it is.