Added costants
Added constants, fixed date class