added more map ability support