Fixed operation.isOperation & improved driver