Update to conform 0.2.0