Fixed aliases parsing