Make Table more functional