Added Proper Static Map code