[0.9.4-dev] working on refectoring