Added support for new data types and return formatted dates