Refactoring yumi to use AliasService