Added compatibility for 1.x.x