Update to conform 0.3.0