Make input fields always optional