Add support for implicit aliases