Switched to more efficient map system