Alias & shorthand support.

Add alias and shorthand support.