Ready for map expansion.