Improved the way we deal with aliases