Add more definitions and shortcuts