Added entity kinds and updated docs