Made constraints as optional. Added date picker