Adding rawInput field and removing the non-null contrainst