Adding YearMonth support