added MAPBox support