Changed and now to some extends works with maps