Handle setting up missing data structures properly