Changes for 0.12