Further development for 0.6.2