Implement Alias system, closes #2