Added support for 1.8 and 1.9