InferEngine improvements