[ artf663024] moved map to static class