Updates to aliases and functions