Added Table collection refactored some services