[#18] Refactor table model
[#18] Rafactoring