added generic entites. updated docs