Changes for 0.90