Alias management

Included alias management features.