Changes for 0.11