added missing props and moved kind to the prototype