Added null modifiers to input fields
Added default values for inputs
Improved input support