Change structure, add helpful data structure