Add position tracking structs