Added some defenitions