Update to conform 0.6.0