[#312]More refactorings