Created main class and fixed Map