Added field types to some forms