Updated tools to use new data model