Return Collections.unmodifiableMap instead of Map