More aliases, new plugins