Added a few more definitions