Conform to new table function signature