Add support for new version up to 1.2.16.