Replaced lists with references to table