Added some missing definitions