added alias managing
merged