Issue #2: Fix alias feature