Code cleaned
Added support of Dates