Defined 2.5.x api