Added tables to service layers