Added code to support 0.6