Add support for Map to isempty and tests