stable build: before changing model structure, moving from lists to dictionaries