Added Date mapping to String