[0.9.4-dev] Some changes