Added date setting feature