Added more entities. Organized list by category.