Break out and add some new aliases