Add Tables and Interfaces