master
Store topology as pointer to avoid dereferencing of nullptr.
Remove unused dicts and add missing includes