Add aliasing (Close #GH-1)