Update to use panadas/util