Move expand aliases to base