Add support for 6.2