Added tableFlag field to form model