Rewrite with esmap
2.0.0