Add more aliases and functions