implemented TableService / modified TableEnhancer