Add a bit more definitions