Added support for maps larger than 25x25