Added aliases and changed output