Added more form options