In the middle of large dictionary refactor