Add v1 aliasing system