Added aliases, cc/esm shortcuts