JAL-1803 JAL-1919 set type when structure file is parsed