Change tableId property to non static