Update for 0.3 development