Added Constraint nodes, worked on fixing null value
Fixed null optional value