Add tables and indices