Update to 0.3 style