Map resized and more parser changes