Added catch up for new tables and keys