Added AliasHandler for some refactoring