Added table abstraction