Improves aliasing, adds aliasing functions