Added the no-more-tables classes