Add aliases support