Added smart table control