Supplement map method and corresponding tests