Prepared for 0.4.0 development