Refactor static maps