added support for collections, dates, Options and lists