Working on more advanced alias support