Lets support versions below 0.9.x as well