User aliases now working as well