Add Alias support

Closes #13