0.7.0: Some changes