Updated entities with doc blocks