Make most form info optional instead of required