Updated the table handler to latest version - Integrated basic functionality