Updated to remove known issue of not supporting dates (which was fixed)