Add indices and tables