HAL-2 fixed schema generation