Fixed date issues. Hash codes added