Changes for 0.50