Refactored field names
Various improvements and bug fixes
Refactoring and new methods added for parsing/formatting dates and labels