Support for 0.6.5