Support for version 0.6.5