Feature/change table records retrun to wrapped class