Added table framework