Some modifications for 0.7 release