Updated to add table controls