Aliases moved to a separate file