Refactoring + datatable 1.10 new api adaptation