Implement functions that use the new data structures