Further improve alias creation #620