Added support for both the new interface in 1.5.3 and the older ones