Refactoring of staticmap-calls