Added some more definitions