Added map detection