Added proper map handling and rendering of its content