Alias map, avoid unnecessary complexity

* Simplify, simplify, simplify