Better count support; added DateTime type