Made map more immutable
Updated to use static