Improve Auto Map Generation 2