Added a bunch of definitions