Added basic alias support