Updating Date conversion and parsing