Added various entity classes for other resources