Refactored building of table by extracting the list into own service.