Rewrite map non-legacy method added