Better function support, better shortcuts