added alias support