Controller and table changes