Added Errorlib support