Aliases refactoring and some improovements