HACKING - ADD server side data to table + refactoring