added some aliasing support