Added support for version 1.8