refactoring: make fat data structures more flexible