Added table mapping