Adding some additional classes for GUI and Date format