Rename, add secondary diagram for data structure