OOP - tables

More modifications to the tables