Move more functions to table