Adding alias patterns. Not thoroughly tested, with debug code.