Changed map to static