More alias support #12