Adding aliases for users
Small updates