Started updating for new data structures