Added shipping fields/enum/form