Added easier ways to map dates and enums