u

README.md

@@ -29,7 +29,7 @@ import (
 )
 
 func Test1(c *igdb.Client) {
-	game, err := igdb.GetItemByID(1942, c.Games.Query)
+	game, err := c.Games.GetByID(1942)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -37,7 +37,7 @@ func Test1(c *igdb.Client) {
 }
 
 func Test2(c *igdb.Client) {
-	games, err := igdb.GetItemsByIDs([]uint64{119171, 119133}, c.Games.Query)
+	games, err := c.Games.GetByIDs([]uint64{119171, 119133})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -45,7 +45,7 @@ func Test2(c *igdb.Client) {
 }
 
 func Test3(c *igdb.Client) {
-	total, err := igdb.GetItemsLength(c.Games.Query)
+	total, err := c.Games.GetLastOneId()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -53,7 +53,7 @@ func Test3(c *igdb.Client) {
 }
 
 func Test4(c *igdb.Client) {
-	games, err := igdb.GetItemsPagniated(0, 10, c.Games.Query)
+	games, err := c.Games.Paginated(0, 10)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -93,21 +93,6 @@ func main() {
 }
 ```
 
-## Advanced Usage
-
-### Using with FlareSolverr
-
-```go
-import "github.com/bestnite/go-flaresolverr"
-
-flaresolverr := flaresolverr.New("http://localhost:8191")
-client := igdb.NewWithFlaresolverr("your-client-id", "your-client-secret", flaresolverr)
-```
-
-### Rate Limiting
-
-The client automatically handles rate limiting with a default of 4 requests per second. This helps prevent hitting IGDB's rate limits.
-
 ## Contributing
 
 Contributions are welcome! Please feel free to submit a Pull Request.

client.go

@@ -2,7 +2,6 @@ package igdb
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/bestnite/go-flaresolverr"
 	"github.com/bestnite/go-igdb/endpoint"
@@ -16,8 +15,6 @@ type Client struct {
 	flaresolverr *flaresolverr.Flaresolverr
 	limiter      *rateLimiter
 
-	EntityEndpoints map[endpoint.EndpointName]endpoint.EntityEndpoint
-
 	AgeRatingCategories            *endpoint.AgeRatingCategories
 	AgeRatingContentDescriptions   *endpoint.AgeRatingContentDescriptions
 	AgeRatingContentDescriptionsV2 *endpoint.AgeRatingContentDescriptionsV2
@@ -97,7 +94,6 @@ func New(clientID, clientSecret string) *Client {
 		limiter:      newRateLimiter(4),
 		token:        NewTwitchToken(clientID, clientSecret),
 		flaresolverr: nil,
-		EntityEndpoints: make(map[endpoint.EndpointName]endpoint.EntityEndpoint),
 	}
 
 	registerAllEndpoints(c)
@@ -131,67 +127,3 @@ func (g *Client) Request(URL string, dataBody any) (*resty.Response, error) {
 	}
 	return resp, nil
 }
-
-func GetItemsPagniated[T any](offset, limit int, f func(string) ([]*T, error)) ([]*T, error) {
-	query := fmt.Sprintf("offset %d; limit %d; f *; sort id asc;", offset, limit)
-	items, err := f(query)
-	if err != nil {
-		return nil, err
-	}
-
-	return items, nil
-}
-
-func GetItemsLength[T any](f func(string) ([]*T, error)) (uint64, error) {
-	query := "fields id; sort id desc; limit 1;"
-	items, err := f(query)
-	if err != nil {
-		return 0, err
-	}
-
-	if len(items) == 0 {
-		return 0, fmt.Errorf("no results: %s", query)
-	}
-
-	type Iid interface {
-		GetId() uint64
-	}
-
-	item, ok := any(items[0]).(Iid)
-
-	if !ok {
-		return 0, fmt.Errorf("failed to convert")
-	}
-
-	return item.GetId(), nil
-}
-
-func GetItemByID[T any](id uint64, f func(string) ([]*T, error)) (*T, error) {
-	query := fmt.Sprintf("where id = %d; fields *;", id)
-	items, err := f(query)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(items) == 0 {
-		return nil, fmt.Errorf("no results: %s", query)
-	}
-
-	return items[0], nil
-}
-
-func GetItemsByIDs[T any](ids []uint64, f func(string) ([]*T, error)) ([]*T, error) {
-	idStrSlice := make([]string, len(ids))
-	for i, id := range ids {
-		idStrSlice[i] = fmt.Sprintf("%d", id)
-	}
-
-	idStr := fmt.Sprintf(`where id = (%s); fields *;`, strings.Join(idStrSlice, ","))
-
-	items, err := f(idStr)
-	if err != nil {
-		return nil, err
-	}
-
-	return items, nil
-}

endpoint/age_rating_categories.go

@@ -4,12 +4,24 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
 type AgeRatingCategories struct {
-	BaseEndpoint
+	BaseEndpoint[pb.AgeRatingCategory]
+}
+
+func NewAgeRatingCategories(request func(URL string, dataBody any) (*resty.Response, error)) *AgeRatingCategories {
+	a := &AgeRatingCategories{
+		BaseEndpoint: BaseEndpoint[pb.AgeRatingCategory]{
+			endpointName: EPAgeRatingCategories,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
 }
 
 func (a *AgeRatingCategories) Query(query string) ([]*pb.AgeRatingCategory, error) {

endpoint/age_rating_content_descriptions.go

@@ -4,12 +4,24 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
 type AgeRatingContentDescriptions struct {
-	BaseEndpoint
+	BaseEndpoint[pb.AgeRatingContentDescription]
+}
+
+func NewAgeRatingContentDescriptions(request func(URL string, dataBody any) (*resty.Response, error)) *AgeRatingContentDescriptions {
+	a := &AgeRatingContentDescriptions{
+		BaseEndpoint[pb.AgeRatingContentDescription]{
+			endpointName: EPAgeRatingContentDescriptions,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
 }
 
 func (a *AgeRatingContentDescriptions) Query(query string) ([]*pb.AgeRatingContentDescription, error) {

endpoint/age_rating_content_descriptions_v2.go

@@ -4,12 +4,24 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
 type AgeRatingContentDescriptionsV2 struct {
-	BaseEndpoint
+	BaseEndpoint[pb.AgeRatingContentDescriptionV2]
+}
+
+func NewAgeRatingContentDescriptionsV2(request func(URL string, dataBody any) (*resty.Response, error)) *AgeRatingContentDescriptionsV2 {
+	a := &AgeRatingContentDescriptionsV2{
+		BaseEndpoint[pb.AgeRatingContentDescriptionV2]{
+			endpointName: EPAgeRatingContentDescriptionsV2,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
 }
 
 func (a *AgeRatingContentDescriptionsV2) Query(query string) ([]*pb.AgeRatingContentDescriptionV2, error) {

endpoint/age_rating_organizations.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type AgeRatingOrganizations struct{ BaseEndpoint }
+type AgeRatingOrganizations struct {
+	BaseEndpoint[pb.AgeRatingOrganization]
+}
+
+func NewAgeRatingOrganizations(request func(URL string, dataBody any) (*resty.Response, error)) *AgeRatingOrganizations {
+	a := &AgeRatingOrganizations{
+		BaseEndpoint[pb.AgeRatingOrganization]{
+			endpointName: EPAgeRatingOrganizations,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *AgeRatingOrganizations) Query(query string) ([]*pb.AgeRatingOrganization, error) {
 	resp, err := a.request("https://api.igdb.com/v4/age_rating_organizations.pb", query)

endpoint/age_ratings.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type AgeRatings struct{ BaseEndpoint }
+type AgeRatings struct {
+	BaseEndpoint[pb.AgeRating]
+}
+
+func NewAgeRatings(request func(URL string, dataBody any) (*resty.Response, error)) *AgeRatings {
+	a := &AgeRatings{
+		BaseEndpoint[pb.AgeRating]{
+			endpointName: EPAgeRatings,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *AgeRatings) Query(query string) ([]*pb.AgeRating, error) {
 	resp, err := a.request("https://api.igdb.com/v4/age_ratings.pb", query)

endpoint/alternative_names.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type AlternativeNames struct{ BaseEndpoint }
+type AlternativeNames struct {
+	BaseEndpoint[pb.AlternativeName]
+}
+
+func NewAlternativeNames(request func(URL string, dataBody any) (*resty.Response, error)) *AlternativeNames {
+	a := &AlternativeNames{
+		BaseEndpoint[pb.AlternativeName]{
+			endpointName: EPAlternativeNames,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *AlternativeNames) Query(query string) ([]*pb.AlternativeName, error) {
 	resp, err := a.request("https://api.igdb.com/v4/alternative_names.pb", query)

endpoint/artworks.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Artworks struct{ BaseEndpoint }
+type Artworks struct {
+	BaseEndpoint[pb.Artwork]
+}
+
+func NewArtworks(request func(URL string, dataBody any) (*resty.Response, error)) *Artworks {
+	a := &Artworks{
+		BaseEndpoint[pb.Artwork]{
+			endpointName: EPArtworks,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Artworks) Query(query string) ([]*pb.Artwork, error) {
 	resp, err := a.request("https://api.igdb.com/v4/artworks.pb", query)

endpoint/base.go

@@ -1,38 +1,70 @@
 package endpoint
 
 import (
+	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/go-resty/resty/v2"
 )
 
-type BaseEndpoint struct {
+type BaseEndpoint[T any] struct {
 	request      func(URL string, dataBody any) (*resty.Response, error)
 	endpointName EndpointName
+	queryFunc    func(string) ([]*T, error)
 }
 
-func NewBaseEndpoint(request func(URL string, dataBody any) (*resty.Response, error), endpointName EndpointName) *BaseEndpoint {
-	return &BaseEndpoint{
-		request:      request,
-		endpointName: endpointName,
-	}
-}
-
-func (b *BaseEndpoint) GetEndpointName() EndpointName {
+func (b *BaseEndpoint[T]) GetEndpointName() EndpointName {
 	return b.endpointName
 }
 
-func (b *BaseEndpoint) Query(query string) (any, error) {
-	return nil, nil
+func (b *BaseEndpoint[T]) Query(query string) ([]*T, error) {
+	if b.queryFunc == nil {
+		return nil, fmt.Errorf("Query method must be implemented by specific endpoint")
+	}
+	return b.queryFunc(query)
 }
 
-func (b *BaseEndpoint) QueryAny(query string) (any, error) {
-	return b.Query(query)
+func (b *BaseEndpoint[T]) GetByID(id uint64) (*T, error) {
+	res, err := b.Query(fmt.Sprintf("where id = %d; fields *;", id))
+	if err != nil {
+		return nil, err
+	}
+	if len(res) == 0 {
+		return nil, fmt.Errorf("no results")
+	}
+	return res[0], nil
 }
 
-type Endpoint interface {
-	GetEndpointName() EndpointName
+func (b *BaseEndpoint[T]) GetByIDs(ids []uint64) ([]*T, error) {
+	builder := strings.Builder{}
+	for i, v := range ids {
+		if i > 0 {
+			builder.WriteByte(',')
+		}
+		builder.WriteString(strconv.FormatUint(v, 10))
+	}
+	return b.Query(fmt.Sprintf("where id = (%s); fields *;", builder.String()))
 }
 
-type EntityEndpoint interface {
-	QueryAny(query string) (any, error)
-	GetEndpointName() EndpointName
+func (b *BaseEndpoint[T]) GetLastOneId() (uint64, error) {
+	res, err := b.Query("fields *; sort id desc; limit 1;")
+	if err != nil {
+		return 0, err
+	}
+	if len(res) == 0 {
+		return 0, fmt.Errorf("no results")
+	}
+	type IdGetter interface {
+		GetId() uint64
+	}
+	item, ok := any(res[0]).(IdGetter)
+	if !ok {
+		return 0, fmt.Errorf("invalid type")
+	}
+	return item.GetId(), nil
+}
+
+func (b *BaseEndpoint[T]) Paginated(offset, limit uint64) ([]*T, error) {
+	return b.Query(fmt.Sprintf("offset %d; limit %d; fields *; sort id asc;", offset, limit))
 }

endpoint/character_genders.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CharacterGenders struct{ BaseEndpoint }
+type CharacterGenders struct {
+	BaseEndpoint[pb.CharacterGender]
+}
+
+func NewCharacterGenders(request func(URL string, dataBody any) (*resty.Response, error)) *CharacterGenders {
+	a := &CharacterGenders{
+		BaseEndpoint[pb.CharacterGender]{
+			endpointName: EPCharacterGenders,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CharacterGenders) Query(query string) ([]*pb.CharacterGender, error) {
 	resp, err := a.request("https://api.igdb.com/v4/character_genders.pb", query)

endpoint/character_mug_shots.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CharacterMugShots struct{ BaseEndpoint }
+type CharacterMugShots struct {
+	BaseEndpoint[pb.CharacterMugShot]
+}
+
+func NewCharacterMugShots(request func(URL string, dataBody any) (*resty.Response, error)) *CharacterMugShots {
+	a := &CharacterMugShots{
+		BaseEndpoint[pb.CharacterMugShot]{
+			endpointName: EPCharacterMugShots,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CharacterMugShots) Query(query string) ([]*pb.CharacterMugShot, error) {
 	resp, err := a.request("https://api.igdb.com/v4/character_mug_shots.pb", query)

endpoint/character_species.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CharacterSpecies struct{ BaseEndpoint }
+type CharacterSpecies struct {
+	BaseEndpoint[pb.CharacterSpecie]
+}
+
+func NewCharacterSpecies(request func(URL string, dataBody any) (*resty.Response, error)) *CharacterSpecies {
+	a := &CharacterSpecies{
+		BaseEndpoint[pb.CharacterSpecie]{
+			endpointName: EPCharacterSpecies,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CharacterSpecies) Query(query string) ([]*pb.CharacterSpecie, error) {
 	resp, err := a.request("https://api.igdb.com/v4/character_species.pb", query)

endpoint/characters.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Characters struct{ BaseEndpoint }
+type Characters struct {
+	BaseEndpoint[pb.Character]
+}
+
+func NewCharacters(request func(URL string, dataBody any) (*resty.Response, error)) *Characters {
+	a := &Characters{
+		BaseEndpoint[pb.Character]{
+			endpointName: EPCharacters,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Characters) Query(query string) ([]*pb.Character, error) {
 	resp, err := a.request("https://api.igdb.com/v4/characters.pb", query)

endpoint/collection_membership_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CollectionMembershipTypes struct{ BaseEndpoint }
+type CollectionMembershipTypes struct {
+	BaseEndpoint[pb.CollectionMembershipType]
+}
+
+func NewCollectionMembershipTypes(request func(URL string, dataBody any) (*resty.Response, error)) *CollectionMembershipTypes {
+	a := &CollectionMembershipTypes{
+		BaseEndpoint[pb.CollectionMembershipType]{
+			endpointName: EPCollectionMembershipTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CollectionMembershipTypes) Query(query string) ([]*pb.CollectionMembershipType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collection_membership_types.pb", query)

endpoint/collection_memberships.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CollectionMemberships struct{ BaseEndpoint }
+type CollectionMemberships struct {
+	BaseEndpoint[pb.CollectionMembership]
+}
+
+func NewCollectionMemberships(request func(URL string, dataBody any) (*resty.Response, error)) *CollectionMemberships {
+	a := &CollectionMemberships{
+		BaseEndpoint[pb.CollectionMembership]{
+			endpointName: EPCollectionMemberships,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CollectionMemberships) Query(query string) ([]*pb.CollectionMembership, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collection_memberships.pb", query)

endpoint/collection_relation_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CollectionRelationTypes struct{ BaseEndpoint }
+type CollectionRelationTypes struct {
+	BaseEndpoint[pb.CollectionRelationType]
+}
+
+func NewCollectionRelationTypes(request func(URL string, dataBody any) (*resty.Response, error)) *CollectionRelationTypes {
+	a := &CollectionRelationTypes{
+		BaseEndpoint[pb.CollectionRelationType]{
+			endpointName: EPCollectionRelationTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CollectionRelationTypes) Query(query string) ([]*pb.CollectionRelationType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collection_relation_types.pb", query)

endpoint/collection_relations.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CollectionRelations struct{ BaseEndpoint }
+type CollectionRelations struct {
+	BaseEndpoint[pb.CollectionRelation]
+}
+
+func NewCollectionRelations(request func(URL string, dataBody any) (*resty.Response, error)) *CollectionRelations {
+	a := &CollectionRelations{
+		BaseEndpoint[pb.CollectionRelation]{
+			endpointName: EPCollectionRelations,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CollectionRelations) Query(query string) ([]*pb.CollectionRelation, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collection_relations.pb", query)

endpoint/collection_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CollectionTypes struct{ BaseEndpoint }
+type CollectionTypes struct {
+	BaseEndpoint[pb.CollectionType]
+}
+
+func NewCollectionTypes(request func(URL string, dataBody any) (*resty.Response, error)) *CollectionTypes {
+	a := &CollectionTypes{
+		BaseEndpoint[pb.CollectionType]{
+			endpointName: EPCollectionTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CollectionTypes) Query(query string) ([]*pb.CollectionType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collection_types.pb", query)

endpoint/collections.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Collections struct{ BaseEndpoint }
+type Collections struct {
+	BaseEndpoint[pb.Collection]
+}
+
+func NewCollections(request func(URL string, dataBody any) (*resty.Response, error)) *Collections {
+	a := &Collections{
+		BaseEndpoint[pb.Collection]{
+			endpointName: EPCollections,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Collections) Query(query string) ([]*pb.Collection, error) {
 	resp, err := a.request("https://api.igdb.com/v4/collections.pb", query)

endpoint/companies.go

@@ -5,11 +5,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Companies struct{ BaseEndpoint }
+type Companies struct {
+	BaseEndpoint[pb.Company]
+}
+
+func NewCompanies(request func(URL string, dataBody any) (*resty.Response, error)) *Companies {
+	a := &Companies{
+		BaseEndpoint[pb.Company]{
+			endpointName: EPCompanies,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Companies) Query(query string) ([]*pb.Company, error) {
 	resp, err := a.request("https://api.igdb.com/v4/companies.pb", query)

endpoint/company_logos.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CompanyLogos struct{ BaseEndpoint }
+type CompanyLogos struct {
+	BaseEndpoint[pb.CompanyLogo]
+}
+
+func NewCompanyLogos(request func(URL string, dataBody any) (*resty.Response, error)) *CompanyLogos {
+	a := &CompanyLogos{
+		BaseEndpoint[pb.CompanyLogo]{
+			endpointName: EPCompanyLogos,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CompanyLogos) Query(query string) ([]*pb.CompanyLogo, error) {
 	resp, err := a.request("https://api.igdb.com/v4/company_logos.pb", query)

endpoint/company_statuses.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CompanyStatuses struct{ BaseEndpoint }
+type CompanyStatuses struct {
+	BaseEndpoint[pb.CompanyStatus]
+}
+
+func NewCompanyStatuses(request func(URL string, dataBody any) (*resty.Response, error)) *CompanyStatuses {
+	a := &CompanyStatuses{
+		BaseEndpoint[pb.CompanyStatus]{
+			endpointName: EPCompanyStatuses,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CompanyStatuses) Query(query string) ([]*pb.CompanyStatus, error) {
 	resp, err := a.request("https://api.igdb.com/v4/company_statuses.pb", query)

endpoint/company_websites.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type CompanyWebsites struct{ BaseEndpoint }
+type CompanyWebsites struct {
+	BaseEndpoint[pb.CompanyWebsite]
+}
+
+func NewCompanyWebsites(request func(URL string, dataBody any) (*resty.Response, error)) *CompanyWebsites {
+	a := &CompanyWebsites{
+		BaseEndpoint[pb.CompanyWebsite]{
+			endpointName: EPCompanyWebsites,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *CompanyWebsites) Query(query string) ([]*pb.CompanyWebsite, error) {
 	resp, err := a.request("https://api.igdb.com/v4/company_websites.pb", query)

endpoint/covers.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Covers struct{ BaseEndpoint }
+type Covers struct {
+	BaseEndpoint[pb.Cover]
+}
+
+func NewCovers(request func(URL string, dataBody any) (*resty.Response, error)) *Covers {
+	a := &Covers{
+		BaseEndpoint[pb.Cover]{
+			endpointName: EPCovers,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Covers) Query(query string) ([]*pb.Cover, error) {
 	resp, err := a.request("https://api.igdb.com/v4/covers.pb", query)

endpoint/date_formats.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type DateFormats struct{ BaseEndpoint }
+type DateFormats struct {
+	BaseEndpoint[pb.DateFormat]
+}
+
+func NewDateFormats(request func(URL string, dataBody any) (*resty.Response, error)) *DateFormats {
+	a := &DateFormats{
+		BaseEndpoint[pb.DateFormat]{
+			endpointName: EPDateFormats,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *DateFormats) Query(query string) ([]*pb.DateFormat, error) {
 	resp, err := a.request("https://api.igdb.com/v4/date_formats.pb", query)

endpoint/event_logos.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type EventLogos struct{ BaseEndpoint }
+type EventLogos struct {
+	BaseEndpoint[pb.EventLogo]
+}
+
+func NewEventLogos(request func(URL string, dataBody any) (*resty.Response, error)) *EventLogos {
+	a := &EventLogos{
+		BaseEndpoint[pb.EventLogo]{
+			endpointName: EPEventLogos,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *EventLogos) Query(query string) ([]*pb.EventLogo, error) {
 	resp, err := a.request("https://api.igdb.com/v4/event_logos.pb", query)

endpoint/event_networks.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type EventNetworks struct{ BaseEndpoint }
+type EventNetworks struct {
+	BaseEndpoint[pb.EventNetwork]
+}
+
+func NewEventNetworks(request func(URL string, dataBody any) (*resty.Response, error)) *EventNetworks {
+	a := &EventNetworks{
+		BaseEndpoint[pb.EventNetwork]{
+			endpointName: EPEventNetworks,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *EventNetworks) Query(query string) ([]*pb.EventNetwork, error) {
 	resp, err := a.request("https://api.igdb.com/v4/event_networks.pb", query)

endpoint/events.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Events struct{ BaseEndpoint }
+type Events struct {
+	BaseEndpoint[pb.Event]
+}
+
+func NewEvents(request func(URL string, dataBody any) (*resty.Response, error)) *Events {
+	a := &Events{
+		BaseEndpoint[pb.Event]{
+			endpointName: EPEvents,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Events) Query(query string) ([]*pb.Event, error) {
 	resp, err := a.request("https://api.igdb.com/v4/events.pb", query)

endpoint/external_game_sources.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type ExternalGameSources struct{ BaseEndpoint }
+type ExternalGameSources struct {
+	BaseEndpoint[pb.ExternalGameSource]
+}
+
+func NewExternalGameSources(request func(URL string, dataBody any) (*resty.Response, error)) *ExternalGameSources {
+	a := &ExternalGameSources{
+		BaseEndpoint[pb.ExternalGameSource]{
+			endpointName: EPExternalGameSources,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *ExternalGameSources) Query(query string) ([]*pb.ExternalGameSource, error) {
 	resp, err := a.request("https://api.igdb.com/v4/external_game_sources.pb", query)

endpoint/external_games.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type ExternalGames struct{ BaseEndpoint }
+type ExternalGames struct {
+	BaseEndpoint[pb.ExternalGame]
+}
+
+func NewExternalGames(request func(URL string, dataBody any) (*resty.Response, error)) *ExternalGames {
+	a := &ExternalGames{
+		BaseEndpoint[pb.ExternalGame]{
+			endpointName: EPExternalGames,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *ExternalGames) Query(query string) ([]*pb.ExternalGame, error) {
 	resp, err := a.request("https://api.igdb.com/v4/external_games.pb", query)

endpoint/franchises.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Franchises struct{ BaseEndpoint }
+type Franchises struct {
+	BaseEndpoint[pb.Franchise]
+}
+
+func NewFranchises(request func(URL string, dataBody any) (*resty.Response, error)) *Franchises {
+	a := &Franchises{
+		BaseEndpoint[pb.Franchise]{
+			endpointName: EPFranchises,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Franchises) Query(query string) ([]*pb.Franchise, error) {
 	resp, err := a.request("https://api.igdb.com/v4/franchises.pb", query)

endpoint/game_engine_logos.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameEngineLogos struct{ BaseEndpoint }
+type GameEngineLogos struct {
+	BaseEndpoint[pb.GameEngineLogo]
+}
+
+func NewGameEngineLogos(request func(URL string, dataBody any) (*resty.Response, error)) *GameEngineLogos {
+	a := &GameEngineLogos{
+		BaseEndpoint[pb.GameEngineLogo]{
+			endpointName: EPGameEngineLogos,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameEngineLogos) Query(query string) ([]*pb.GameEngineLogo, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_engine_logos.pb", query)

endpoint/game_engines.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameEngines struct{ BaseEndpoint }
+type GameEngines struct {
+	BaseEndpoint[pb.GameEngine]
+}
+
+func NewGameEngines(request func(URL string, dataBody any) (*resty.Response, error)) *GameEngines {
+	a := &GameEngines{
+		BaseEndpoint[pb.GameEngine]{
+			endpointName: EPGameEngines,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameEngines) Query(query string) ([]*pb.GameEngine, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_engines.pb", query)

endpoint/game_localizations.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameLocalizations struct{ BaseEndpoint }
+type GameLocalizations struct {
+	BaseEndpoint[pb.GameLocalization]
+}
+
+func NewGameLocalizations(request func(URL string, dataBody any) (*resty.Response, error)) *GameLocalizations {
+	a := &GameLocalizations{
+		BaseEndpoint[pb.GameLocalization]{
+			endpointName: EPGameLocalizations,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameLocalizations) Query(query string) ([]*pb.GameLocalization, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_localizations.pb", query)

endpoint/game_modes.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameModes struct{ BaseEndpoint }
+type GameModes struct {
+	BaseEndpoint[pb.GameMode]
+}
+
+func NewGameModes(request func(URL string, dataBody any) (*resty.Response, error)) *GameModes {
+	a := &GameModes{
+		BaseEndpoint[pb.GameMode]{
+			endpointName: EPGameModes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameModes) Query(query string) ([]*pb.GameMode, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_modes.pb", query)

endpoint/game_release_formats.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameReleaseFormats struct{ BaseEndpoint }
+type GameReleaseFormats struct {
+	BaseEndpoint[pb.GameReleaseFormat]
+}
+
+func NewGameReleaseFormats(request func(URL string, dataBody any) (*resty.Response, error)) *GameReleaseFormats {
+	a := &GameReleaseFormats{
+		BaseEndpoint[pb.GameReleaseFormat]{
+			endpointName: EPGameReleaseFormats,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameReleaseFormats) Query(query string) ([]*pb.GameReleaseFormat, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_release_formats.pb", query)

endpoint/game_statuses.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameStatuses struct{ BaseEndpoint }
+type GameStatuses struct {
+	BaseEndpoint[pb.GameStatus]
+}
+
+func NewGameStatuses(request func(URL string, dataBody any) (*resty.Response, error)) *GameStatuses {
+	a := &GameStatuses{
+		BaseEndpoint[pb.GameStatus]{
+			endpointName: EPGameStatuses,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameStatuses) Query(query string) ([]*pb.GameStatus, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_statuses.pb", query)

endpoint/game_time_to_beats.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameTimeToBeats struct{ BaseEndpoint }
+type GameTimeToBeats struct {
+	BaseEndpoint[pb.GameTimeToBeat]
+}
+
+func NewGameTimeToBeats(request func(URL string, dataBody any) (*resty.Response, error)) *GameTimeToBeats {
+	a := &GameTimeToBeats{
+		BaseEndpoint[pb.GameTimeToBeat]{
+			endpointName: EPGameTimeToBeats,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameTimeToBeats) Query(query string) ([]*pb.GameTimeToBeat, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_time_to_beats.pb", query)

endpoint/game_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameTypes struct{ BaseEndpoint }
+type GameTypes struct {
+	BaseEndpoint[pb.GameType]
+}
+
+func NewGameTypes(request func(URL string, dataBody any) (*resty.Response, error)) *GameTypes {
+	a := &GameTypes{
+		BaseEndpoint[pb.GameType]{
+			endpointName: EPGameTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameTypes) Query(query string) ([]*pb.GameType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_types.pb", query)

endpoint/game_version_feature_values.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameVersionFeatureValues struct{ BaseEndpoint }
+type GameVersionFeatureValues struct {
+	BaseEndpoint[pb.GameVersionFeatureValue]
+}
+
+func NewGameVersionFeatureValues(request func(URL string, dataBody any) (*resty.Response, error)) *GameVersionFeatureValues {
+	a := &GameVersionFeatureValues{
+		BaseEndpoint[pb.GameVersionFeatureValue]{
+			endpointName: EPGameVersionFeatureValues,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameVersionFeatureValues) Query(query string) ([]*pb.GameVersionFeatureValue, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_version_feature_values.pb", query)

endpoint/game_version_features.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameVersionFeatures struct{ BaseEndpoint }
+type GameVersionFeatures struct {
+	BaseEndpoint[pb.GameVersionFeature]
+}
+
+func NewGameVersionFeatures(request func(URL string, dataBody any) (*resty.Response, error)) *GameVersionFeatures {
+	a := &GameVersionFeatures{
+		BaseEndpoint[pb.GameVersionFeature]{
+			endpointName: EPGameVersionFeatures,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameVersionFeatures) Query(query string) ([]*pb.GameVersionFeature, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_version_features.pb", query)

endpoint/game_versions.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameVersions struct{ BaseEndpoint }
+type GameVersions struct {
+	BaseEndpoint[pb.GameVersion]
+}
+
+func NewGameVersions(request func(URL string, dataBody any) (*resty.Response, error)) *GameVersions {
+	a := &GameVersions{
+		BaseEndpoint[pb.GameVersion]{
+			endpointName: EPGameVersions,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameVersions) Query(query string) ([]*pb.GameVersion, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_versions.pb", query)

endpoint/game_videos.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type GameVideos struct{ BaseEndpoint }
+type GameVideos struct {
+	BaseEndpoint[pb.GameVideo]
+}
+
+func NewGameVideos(request func(URL string, dataBody any) (*resty.Response, error)) *GameVideos {
+	a := &GameVideos{
+		BaseEndpoint[pb.GameVideo]{
+			endpointName: EPGameVideos,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *GameVideos) Query(query string) ([]*pb.GameVideo, error) {
 	resp, err := a.request("https://api.igdb.com/v4/game_videos.pb", query)

endpoint/games.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Games struct{ BaseEndpoint }
+type Games struct {
+	BaseEndpoint[pb.Game]
+}
+
+func NewGames(request func(URL string, dataBody any) (*resty.Response, error)) *Games {
+	a := &Games{
+		BaseEndpoint[pb.Game]{
+			endpointName: EPGames,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Games) Query(query string) ([]*pb.Game, error) {
 	resp, err := a.request("https://api.igdb.com/v4/games.pb", query)

endpoint/genres.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Genres struct{ BaseEndpoint }
+type Genres struct {
+	BaseEndpoint[pb.Genre]
+}
+
+func NewGenres(request func(URL string, dataBody any) (*resty.Response, error)) *Genres {
+	a := &Genres{
+		BaseEndpoint[pb.Genre]{
+			endpointName: EPGenres,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Genres) Query(query string) ([]*pb.Genre, error) {
 	resp, err := a.request("https://api.igdb.com/v4/genres.pb", query)

endpoint/involved_companies.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type InvolvedCompanies struct{ BaseEndpoint }
+type InvolvedCompanies struct {
+	BaseEndpoint[pb.InvolvedCompany]
+}
+
+func NewInvolvedCompanies(request func(URL string, dataBody any) (*resty.Response, error)) *InvolvedCompanies {
+	a := &InvolvedCompanies{
+		BaseEndpoint[pb.InvolvedCompany]{
+			endpointName: EPInvolvedCompanies,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *InvolvedCompanies) Query(query string) ([]*pb.InvolvedCompany, error) {
 	resp, err := a.request("https://api.igdb.com/v4/involved_companies.pb", query)

endpoint/keywords.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Keywords struct{ BaseEndpoint }
+type Keywords struct {
+	BaseEndpoint[pb.Keyword]
+}
+
+func NewKeywords(request func(URL string, dataBody any) (*resty.Response, error)) *Keywords {
+	a := &Keywords{
+		BaseEndpoint[pb.Keyword]{
+			endpointName: EPKeywords,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Keywords) Query(query string) ([]*pb.Keyword, error) {
 	resp, err := a.request("https://api.igdb.com/v4/keywords.pb", query)

endpoint/language_support_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type LanguageSupportTypes struct{ BaseEndpoint }
+type LanguageSupportTypes struct {
+	BaseEndpoint[pb.LanguageSupportType]
+}
+
+func NewLanguageSupportTypes(request func(URL string, dataBody any) (*resty.Response, error)) *LanguageSupportTypes {
+	a := &LanguageSupportTypes{
+		BaseEndpoint[pb.LanguageSupportType]{
+			endpointName: EPLanguageSupportTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *LanguageSupportTypes) Query(query string) ([]*pb.LanguageSupportType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/language_support_types.pb", query)

endpoint/language_supports.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type LanguageSupports struct{ BaseEndpoint }
+type LanguageSupports struct {
+	BaseEndpoint[pb.LanguageSupport]
+}
+
+func NewLanguageSupports(request func(URL string, dataBody any) (*resty.Response, error)) *LanguageSupports {
+	a := &LanguageSupports{
+		BaseEndpoint[pb.LanguageSupport]{
+			endpointName: EPLanguageSupports,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *LanguageSupports) Query(query string) ([]*pb.LanguageSupport, error) {
 	resp, err := a.request("https://api.igdb.com/v4/language_supports.pb", query)

endpoint/languages.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Languages struct{ BaseEndpoint }
+type Languages struct {
+	BaseEndpoint[pb.Language]
+}
+
+func NewLanguages(request func(URL string, dataBody any) (*resty.Response, error)) *Languages {
+	a := &Languages{
+		BaseEndpoint[pb.Language]{
+			endpointName: EPLanguages,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Languages) Query(query string) ([]*pb.Language, error) {
 	resp, err := a.request("https://api.igdb.com/v4/languages.pb", query)

endpoint/multiplayer_modes.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type MultiplayerModes struct{ BaseEndpoint }
+type MultiplayerModes struct {
+	BaseEndpoint[pb.MultiplayerMode]
+}
+
+func NewMultiplayerModes(request func(URL string, dataBody any) (*resty.Response, error)) *MultiplayerModes {
+	a := &MultiplayerModes{
+		BaseEndpoint[pb.MultiplayerMode]{
+			endpointName: EPMultiplayerModes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *MultiplayerModes) Query(query string) ([]*pb.MultiplayerMode, error) {
 	resp, err := a.request("https://api.igdb.com/v4/multiplayer_modes.pb", query)

endpoint/network_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type NetworkTypes struct{ BaseEndpoint }
+type NetworkTypes struct {
+	BaseEndpoint[pb.NetworkType]
+}
+
+func NewNetworkTypes(request func(URL string, dataBody any) (*resty.Response, error)) *NetworkTypes {
+	a := &NetworkTypes{
+		BaseEndpoint[pb.NetworkType]{
+			endpointName: EPNetworkTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *NetworkTypes) Query(query string) ([]*pb.NetworkType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/network_types.pb", query)

endpoint/platform_families.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformFamilies struct{ BaseEndpoint }
+type PlatformFamilies struct {
+	BaseEndpoint[pb.PlatformFamily]
+}
+
+func NewPlatformFamilies(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformFamilies {
+	a := &PlatformFamilies{
+		BaseEndpoint[pb.PlatformFamily]{
+			endpointName: EPPlatformFamilies,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformFamilies) Query(query string) ([]*pb.PlatformFamily, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_families.pb", query)

endpoint/platform_logos.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformLogos struct{ BaseEndpoint }
+type PlatformLogos struct {
+	BaseEndpoint[pb.PlatformLogo]
+}
+
+func NewPlatformLogos(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformLogos {
+	a := &PlatformLogos{
+		BaseEndpoint[pb.PlatformLogo]{
+			endpointName: EPPlatformLogos,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformLogos) Query(query string) ([]*pb.PlatformLogo, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_logos.pb", query)

endpoint/platform_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformTypes struct{ BaseEndpoint }
+type PlatformTypes struct {
+	BaseEndpoint[pb.PlatformType]
+}
+
+func NewPlatformTypes(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformTypes {
+	a := &PlatformTypes{
+		BaseEndpoint[pb.PlatformType]{
+			endpointName: EPPlatformTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformTypes) Query(query string) ([]*pb.PlatformType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_types.pb", query)

endpoint/platform_version_companies.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformVersionCompanies struct{ BaseEndpoint }
+type PlatformVersionCompanies struct {
+	BaseEndpoint[pb.PlatformVersionCompany]
+}
+
+func NewPlatformVersionCompanies(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformVersionCompanies {
+	a := &PlatformVersionCompanies{
+		BaseEndpoint[pb.PlatformVersionCompany]{
+			endpointName: EPPlatformVersionCompanies,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformVersionCompanies) Query(query string) ([]*pb.PlatformVersionCompany, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_version_companies.pb", query)

endpoint/platform_version_release_dates.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformVersionReleaseDates struct{ BaseEndpoint }
+type PlatformVersionReleaseDates struct {
+	BaseEndpoint[pb.PlatformVersionReleaseDate]
+}
+
+func NewPlatformVersionReleaseDates(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformVersionReleaseDates {
+	a := &PlatformVersionReleaseDates{
+		BaseEndpoint[pb.PlatformVersionReleaseDate]{
+			endpointName: EPPlatformVersionReleaseDates,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformVersionReleaseDates) Query(query string) ([]*pb.PlatformVersionReleaseDate, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_version_release_dates.pb", query)

endpoint/platform_versions.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformVersions struct{ BaseEndpoint }
+type PlatformVersions struct {
+	BaseEndpoint[pb.PlatformVersion]
+}
+
+func NewPlatformVersions(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformVersions {
+	a := &PlatformVersions{
+		BaseEndpoint[pb.PlatformVersion]{
+			endpointName: EPPlatformVersions,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformVersions) Query(query string) ([]*pb.PlatformVersion, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_versions.pb", query)

endpoint/platform_websites.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlatformWebsites struct{ BaseEndpoint }
+type PlatformWebsites struct {
+	BaseEndpoint[pb.PlatformWebsite]
+}
+
+func NewPlatformWebsites(request func(URL string, dataBody any) (*resty.Response, error)) *PlatformWebsites {
+	a := &PlatformWebsites{
+		BaseEndpoint[pb.PlatformWebsite]{
+			endpointName: EPPlatformWebsites,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlatformWebsites) Query(query string) ([]*pb.PlatformWebsite, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platform_websites.pb", query)

endpoint/platforms.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Platforms struct{ BaseEndpoint }
+type Platforms struct {
+	BaseEndpoint[pb.Platform]
+}
+
+func NewPlatforms(request func(URL string, dataBody any) (*resty.Response, error)) *Platforms {
+	a := &Platforms{
+		BaseEndpoint[pb.Platform]{
+			endpointName: EPPlatforms,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Platforms) Query(query string) ([]*pb.Platform, error) {
 	resp, err := a.request("https://api.igdb.com/v4/platforms.pb", query)

endpoint/player_perspectives.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PlayerPerspectives struct{ BaseEndpoint }
+type PlayerPerspectives struct {
+	BaseEndpoint[pb.PlayerPerspective]
+}
+
+func NewPlayerPerspectives(request func(URL string, dataBody any) (*resty.Response, error)) *PlayerPerspectives {
+	a := &PlayerPerspectives{
+		BaseEndpoint[pb.PlayerPerspective]{
+			endpointName: EPPlayerPerspectives,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PlayerPerspectives) Query(query string) ([]*pb.PlayerPerspective, error) {
 	resp, err := a.request("https://api.igdb.com/v4/player_perspectives.pb", query)

endpoint/popularity_primitives.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PopularityPrimitives struct{ BaseEndpoint }
+type PopularityPrimitives struct {
+	BaseEndpoint[pb.PopularityPrimitive]
+}
+
+func NewPopularityPrimitives(request func(URL string, dataBody any) (*resty.Response, error)) *PopularityPrimitives {
+	a := &PopularityPrimitives{
+		BaseEndpoint[pb.PopularityPrimitive]{
+			endpointName: EPPopularityPrimitives,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PopularityPrimitives) Query(query string) ([]*pb.PopularityPrimitive, error) {
 	resp, err := a.request("https://api.igdb.com/v4/popularity_primitives.pb", query)

endpoint/popularity_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type PopularityTypes struct{ BaseEndpoint }
+type PopularityTypes struct {
+	BaseEndpoint[pb.PopularityType]
+}
+
+func NewPopularityTypes(request func(URL string, dataBody any) (*resty.Response, error)) *PopularityTypes {
+	a := &PopularityTypes{
+		BaseEndpoint[pb.PopularityType]{
+			endpointName: EPPopularityTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *PopularityTypes) Query(query string) ([]*pb.PopularityType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/popularity_types.pb", query)

endpoint/regions.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Regions struct{ BaseEndpoint }
+type Regions struct {
+	BaseEndpoint[pb.Region]
+}
+
+func NewRegions(request func(URL string, dataBody any) (*resty.Response, error)) *Regions {
+	a := &Regions{
+		BaseEndpoint[pb.Region]{
+			endpointName: EPRegions,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Regions) Query(query string) ([]*pb.Region, error) {
 	resp, err := a.request("https://api.igdb.com/v4/regions.pb", query)

endpoint/release_date_regions.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type ReleaseDateRegions struct{ BaseEndpoint }
+type ReleaseDateRegions struct {
+	BaseEndpoint[pb.ReleaseDateRegion]
+}
+
+func NewReleaseDateRegions(request func(URL string, dataBody any) (*resty.Response, error)) *ReleaseDateRegions {
+	a := &ReleaseDateRegions{
+		BaseEndpoint[pb.ReleaseDateRegion]{
+			endpointName: EPReleaseDateRegions,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *ReleaseDateRegions) Query(query string) ([]*pb.ReleaseDateRegion, error) {
 	resp, err := a.request("https://api.igdb.com/v4/release_date_regions.pb", query)

endpoint/release_date_statuses.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type ReleaseDateStatuses struct{ BaseEndpoint }
+type ReleaseDateStatuses struct {
+	BaseEndpoint[pb.ReleaseDateStatus]
+}
+
+func NewReleaseDateStatuses(request func(URL string, dataBody any) (*resty.Response, error)) *ReleaseDateStatuses {
+	a := &ReleaseDateStatuses{
+		BaseEndpoint[pb.ReleaseDateStatus]{
+			endpointName: EPReleaseDateStatuses,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *ReleaseDateStatuses) Query(query string) ([]*pb.ReleaseDateStatus, error) {
 	resp, err := a.request("https://api.igdb.com/v4/release_date_statuses.pb", query)

endpoint/release_dates.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type ReleaseDates struct{ BaseEndpoint }
+type ReleaseDates struct {
+	BaseEndpoint[pb.ReleaseDate]
+}
+
+func NewReleaseDates(request func(URL string, dataBody any) (*resty.Response, error)) *ReleaseDates {
+	a := &ReleaseDates{
+		BaseEndpoint[pb.ReleaseDate]{
+			endpointName: EPReleaseDates,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *ReleaseDates) Query(query string) ([]*pb.ReleaseDate, error) {
 	resp, err := a.request("https://api.igdb.com/v4/release_dates.pb", query)

endpoint/screenshots.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Screenshots struct{ BaseEndpoint }
+type Screenshots struct {
+	BaseEndpoint[pb.Screenshot]
+}
+
+func NewScreenshots(request func(URL string, dataBody any) (*resty.Response, error)) *Screenshots {
+	a := &Screenshots{
+		BaseEndpoint[pb.Screenshot]{
+			endpointName: EPScreenshots,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Screenshots) Query(query string) ([]*pb.Screenshot, error) {
 	resp, err := a.request("https://api.igdb.com/v4/screenshots.pb", query)

endpoint/search.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/bestnite/go-flaresolverr"
@@ -22,10 +23,16 @@ var webSearchCFCookies struct {
 }
 
 type Search struct {
-	BaseEndpoint
+	request      func(URL string, dataBody any) (*resty.Response, error)
 	flaresolverr *flaresolverr.Flaresolverr
 }
 
+func NewSearch(request func(URL string, dataBody any) (*resty.Response, error)) *Search {
+	return &Search{
+		request: request,
+	}
+}
+
 func (a *Search) Search(query string) ([]*pb.Search, error) {
 	resp, err := a.request("https://api.igdb.com/v4/search.pb", query)
 	if err != nil {

endpoint/themes.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Themes struct{ BaseEndpoint }
+type Themes struct {
+	BaseEndpoint[pb.Theme]
+}
+
+func NewThemes(request func(URL string, dataBody any) (*resty.Response, error)) *Themes {
+	a := &Themes{
+		BaseEndpoint[pb.Theme]{
+			endpointName: EPThemes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Themes) Query(query string) ([]*pb.Theme, error) {
 	resp, err := a.request("https://api.igdb.com/v4/themes.pb", query)

endpoint/webhooks.go

@@ -4,9 +4,19 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+
+	"github.com/go-resty/resty/v2"
 )
 
-type Webhooks struct{ BaseEndpoint }
+type Webhooks struct {
+	request func(URL string, dataBody any) (*resty.Response, error)
+}
+
+func NewWebhooks(request func(URL string, dataBody any) (*resty.Response, error)) *Webhooks {
+	return &Webhooks{
+		request: request,
+	}
+}
 
 func (a *Webhooks) Register(endpoint EndpointName, secret, callbackUrl string) error {
 	dataBody := url.Values{}

endpoint/website_types.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type WebsiteTypes struct{ BaseEndpoint }
+type WebsiteTypes struct {
+	BaseEndpoint[pb.WebsiteType]
+}
+
+func NewWebsiteTypes(request func(URL string, dataBody any) (*resty.Response, error)) *WebsiteTypes {
+	a := &WebsiteTypes{
+		BaseEndpoint[pb.WebsiteType]{
+			endpointName: EPWebsiteTypes,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *WebsiteTypes) Query(query string) ([]*pb.WebsiteType, error) {
 	resp, err := a.request("https://api.igdb.com/v4/website_types.pb", query)

endpoint/websites.go

@@ -4,11 +4,25 @@ import (
 	"fmt"
 
 	pb "github.com/bestnite/go-igdb/proto"
+	"github.com/go-resty/resty/v2"
 
 	"google.golang.org/protobuf/proto"
 )
 
-type Websites struct{ BaseEndpoint }
+type Websites struct {
+	BaseEndpoint[pb.Website]
+}
+
+func NewWebsites(request func(URL string, dataBody any) (*resty.Response, error)) *Websites {
+	a := &Websites{
+		BaseEndpoint[pb.Website]{
+			endpointName: EPWebsites,
+			request:      request,
+		},
+	}
+	a.queryFunc = a.Query
+	return a
+}
 
 func (a *Websites) Query(query string) ([]*pb.Website, error) {
 	resp, err := a.request("https://api.igdb.com/v4/websites.pb", query)

register_endpoints.go

@@ -1,358 +1,149 @@
 package igdb
 
-import "github.com/bestnite/go-igdb/endpoint"
+import (
+	"github.com/bestnite/go-igdb/endpoint"
+)
 
 func registerAllEndpoints(c *Client) {
-	c.AgeRatingCategories = &endpoint.AgeRatingCategories{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAgeRatingCategories),
-	}
-	c.EntityEndpoints[endpoint.EPAgeRatingCategories] = c.AgeRatingCategories
+	c.AgeRatingCategories = endpoint.NewAgeRatingCategories(c.Request)
 
-	c.AgeRatingContentDescriptions = &endpoint.AgeRatingContentDescriptions{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAgeRatingContentDescriptions),
-	}
-	c.EntityEndpoints[endpoint.EPAgeRatingContentDescriptions] = c.AgeRatingContentDescriptions
+	c.AgeRatingContentDescriptions = endpoint.NewAgeRatingContentDescriptions(c.Request)
 
-	c.AgeRatingContentDescriptionsV2 = &endpoint.AgeRatingContentDescriptionsV2{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAgeRatingContentDescriptionsV2),
-	}
-	c.EntityEndpoints[endpoint.EPAgeRatingContentDescriptionsV2] = c.AgeRatingContentDescriptionsV2
+	c.AgeRatingContentDescriptionsV2 = endpoint.NewAgeRatingContentDescriptionsV2(c.Request)
 
-	c.AgeRatingOrganizations = &endpoint.AgeRatingOrganizations{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAgeRatingOrganizations),
-	}
-	c.EntityEndpoints[endpoint.EPAgeRatingOrganizations] = c.AgeRatingOrganizations
+	c.AgeRatingOrganizations = endpoint.NewAgeRatingOrganizations(c.Request)
 
-	c.AgeRatings = &endpoint.AgeRatings{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAgeRatings),
-	}
-	c.EntityEndpoints[endpoint.EPAgeRatings] = c.AgeRatings
+	c.AgeRatings = endpoint.NewAgeRatings(c.Request)
 
-	c.AlternativeNames = &endpoint.AlternativeNames{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPAlternativeNames),
-	}
-	c.EntityEndpoints[endpoint.EPAlternativeNames] = c.AlternativeNames
+	c.AlternativeNames = endpoint.NewAlternativeNames(c.Request)
 
-	c.Artworks = &endpoint.Artworks{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPArtworks),
-	}
-	c.EntityEndpoints[endpoint.EPArtworks] = c.Artworks
+	c.Artworks = endpoint.NewArtworks(c.Request)
 
-	c.CharacterGenders = &endpoint.CharacterGenders{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCharacterGenders),
-	}
-	c.EntityEndpoints[endpoint.EPCharacterGenders] = c.CharacterGenders
+	c.CharacterGenders = endpoint.NewCharacterGenders(c.Request)
 
-	c.CharacterMugShots = &endpoint.CharacterMugShots{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCharacterMugShots),
-	}
-	c.EntityEndpoints[endpoint.EPCharacterMugShots] = c.CharacterMugShots
+	c.CharacterMugShots = endpoint.NewCharacterMugShots(c.Request)
 
-	c.Characters = &endpoint.Characters{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCharacters),
-	}
-	c.EntityEndpoints[endpoint.EPCharacters] = c.Characters
+	c.Characters = endpoint.NewCharacters(c.Request)
 
-	c.CharacterSpecies = &endpoint.CharacterSpecies{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCharacterSpecies),
-	}
-	c.EntityEndpoints[endpoint.EPCharacterSpecies] = c.CharacterSpecies
+	c.CharacterSpecies = endpoint.NewCharacterSpecies(c.Request)
 
-	c.CollectionMemberships = &endpoint.CollectionMemberships{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollectionMemberships),
-	}
-	c.EntityEndpoints[endpoint.EPCollectionMemberships] = c.CollectionMemberships
+	c.CollectionMemberships = endpoint.NewCollectionMemberships(c.Request)
 
-	c.CollectionMembershipTypes = &endpoint.CollectionMembershipTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollectionMembershipTypes),
-	}
-	c.EntityEndpoints[endpoint.EPCollectionMembershipTypes] = c.CollectionMembershipTypes
+	c.CollectionMembershipTypes = endpoint.NewCollectionMembershipTypes(c.Request)
 
-	c.CollectionRelations = &endpoint.CollectionRelations{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollectionRelations),
-	}
-	c.EntityEndpoints[endpoint.EPCollectionRelations] = c.CollectionRelations
+	c.CollectionRelations = endpoint.NewCollectionRelations(c.Request)
 
-	c.CollectionRelationTypes = &endpoint.CollectionRelationTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollectionRelationTypes),
-	}
-	c.EntityEndpoints[endpoint.EPCollectionRelationTypes] = c.CollectionRelationTypes
+	c.CollectionRelationTypes = endpoint.NewCollectionRelationTypes(c.Request)
 
-	c.Collections = &endpoint.Collections{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollections),
-	}
-	c.EntityEndpoints[endpoint.EPCollections] = c.Collections
+	c.Collections = endpoint.NewCollections(c.Request)
 
-	c.CollectionTypes = &endpoint.CollectionTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCollectionTypes),
-	}
-	c.EntityEndpoints[endpoint.EPCollectionTypes] = c.CollectionTypes
+	c.CollectionTypes = endpoint.NewCollectionTypes(c.Request)
 
-	c.Companies = &endpoint.Companies{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCompanies),
-	}
-	c.EntityEndpoints[endpoint.EPCompanies] = c.Companies
+	c.Companies = endpoint.NewCompanies(c.Request)
 
-	c.CompanyLogos = &endpoint.CompanyLogos{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCompanyLogos),
-	}
-	c.EntityEndpoints[endpoint.EPCompanyLogos] = c.CompanyLogos
+	c.CompanyLogos = endpoint.NewCompanyLogos(c.Request)
 
-	c.CompanyStatuses = &endpoint.CompanyStatuses{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCompanyStatuses),
-	}
-	c.EntityEndpoints[endpoint.EPCompanyStatuses] = c.CompanyStatuses
+	c.CompanyStatuses = endpoint.NewCompanyStatuses(c.Request)
 
-	c.CompanyWebsites = &endpoint.CompanyWebsites{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCompanyWebsites),
-	}
-	c.EntityEndpoints[endpoint.EPCompanyWebsites] = c.CompanyWebsites
+	c.CompanyWebsites = endpoint.NewCompanyWebsites(c.Request)
 
-	c.Covers = &endpoint.Covers{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPCovers),
-	}
-	c.EntityEndpoints[endpoint.EPCovers] = c.Covers
+	c.Covers = endpoint.NewCovers(c.Request)
 
-	c.DateFormats = &endpoint.DateFormats{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPDateFormats),
-	}
-	c.EntityEndpoints[endpoint.EPDateFormats] = c.DateFormats
+	c.DateFormats = endpoint.NewDateFormats(c.Request)
 
-	c.EventLogos = &endpoint.EventLogos{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPEventLogos),
-	}
-	c.EntityEndpoints[endpoint.EPEventLogos] = c.EventLogos
+	c.EventLogos = endpoint.NewEventLogos(c.Request)
 
-	c.EventNetworks = &endpoint.EventNetworks{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPEventNetworks),
-	}
-	c.EntityEndpoints[endpoint.EPEventNetworks] = c.EventNetworks
+	c.EventNetworks = endpoint.NewEventNetworks(c.Request)
 
-	c.Events = &endpoint.Events{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPEvents),
-	}
-	c.EntityEndpoints[endpoint.EPEvents] = c.Events
+	c.Events = endpoint.NewEvents(c.Request)
 
-	c.ExternalGames = &endpoint.ExternalGames{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPExternalGames),
-	}
-	c.EntityEndpoints[endpoint.EPExternalGames] = c.ExternalGames
+	c.ExternalGames = endpoint.NewExternalGames(c.Request)
 
-	c.ExternalGameSources = &endpoint.ExternalGameSources{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPExternalGameSources),
-	}
-	c.EntityEndpoints[endpoint.EPExternalGameSources] = c.ExternalGameSources
+	c.ExternalGameSources = endpoint.NewExternalGameSources(c.Request)
 
-	c.Franchises = &endpoint.Franchises{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPFranchises),
-	}
-	c.EntityEndpoints[endpoint.EPFranchises] = c.Franchises
+	c.Franchises = endpoint.NewFranchises(c.Request)
 
-	c.GameEngineLogos = &endpoint.GameEngineLogos{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameEngineLogos),
-	}
-	c.EntityEndpoints[endpoint.EPGameEngineLogos] = c.GameEngineLogos
+	c.GameEngineLogos = endpoint.NewGameEngineLogos(c.Request)
 
-	c.GameEngines = &endpoint.GameEngines{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameEngines),
-	}
-	c.EntityEndpoints[endpoint.EPGameEngines] = c.GameEngines
+	c.GameEngines = endpoint.NewGameEngines(c.Request)
 
-	c.GameLocalizations = &endpoint.GameLocalizations{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameLocalizations),
-	}
-	c.EntityEndpoints[endpoint.EPGameLocalizations] = c.GameLocalizations
+	c.GameLocalizations = endpoint.NewGameLocalizations(c.Request)
 
-	c.GameModes = &endpoint.GameModes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameModes),
-	}
-	c.EntityEndpoints[endpoint.EPGameModes] = c.GameModes
+	c.GameModes = endpoint.NewGameModes(c.Request)
 
-	c.GameReleaseFormats = &endpoint.GameReleaseFormats{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameReleaseFormats),
-	}
-	c.EntityEndpoints[endpoint.EPGameReleaseFormats] = c.GameReleaseFormats
+	c.GameReleaseFormats = endpoint.NewGameReleaseFormats(c.Request)
 
-	c.Games = &endpoint.Games{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGames),
-	}
-	c.EntityEndpoints[endpoint.EPGames] = c.Games
+	c.Games = endpoint.NewGames(c.Request)
 
-	c.GameStatuses = &endpoint.GameStatuses{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameStatuses),
-	}
-	c.EntityEndpoints[endpoint.EPGameStatuses] = c.GameStatuses
+	c.GameStatuses = endpoint.NewGameStatuses(c.Request)
 
-	c.GameTimeToBeats = &endpoint.GameTimeToBeats{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameTimeToBeats),
-	}
-	c.EntityEndpoints[endpoint.EPGameTimeToBeats] = c.GameTimeToBeats
+	c.GameTimeToBeats = endpoint.NewGameTimeToBeats(c.Request)
 
-	c.GameTypes = &endpoint.GameTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameTypes),
-	}
-	c.EntityEndpoints[endpoint.EPGameTypes] = c.GameTypes
+	c.GameTypes = endpoint.NewGameTypes(c.Request)
 
-	c.GameVersionFeatures = &endpoint.GameVersionFeatures{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameVersionFeatures),
-	}
-	c.EntityEndpoints[endpoint.EPGameVersionFeatures] = c.GameVersionFeatures
+	c.GameVersionFeatures = endpoint.NewGameVersionFeatures(c.Request)
 
-	c.GameVersionFeatureValues = &endpoint.GameVersionFeatureValues{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameVersionFeatureValues),
-	}
-	c.EntityEndpoints[endpoint.EPGameVersionFeatureValues] = c.GameVersionFeatureValues
+	c.GameVersionFeatureValues = endpoint.NewGameVersionFeatureValues(c.Request)
 
-	c.GameVersions = &endpoint.GameVersions{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameVersions),
-	}
-	c.EntityEndpoints[endpoint.EPGameVersions] = c.GameVersions
+	c.GameVersions = endpoint.NewGameVersions(c.Request)
 
-	c.GameVideos = &endpoint.GameVideos{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGameVideos),
-	}
-	c.EntityEndpoints[endpoint.EPGameVideos] = c.GameVideos
+	c.GameVideos = endpoint.NewGameVideos(c.Request)
 
-	c.Genres = &endpoint.Genres{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPGenres),
-	}
-	c.EntityEndpoints[endpoint.EPGenres] = c.Genres
+	c.Genres = endpoint.NewGenres(c.Request)
 
-	c.InvolvedCompanies = &endpoint.InvolvedCompanies{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPInvolvedCompanies),
-	}
-	c.EntityEndpoints[endpoint.EPInvolvedCompanies] = c.InvolvedCompanies
+	c.InvolvedCompanies = endpoint.NewInvolvedCompanies(c.Request)
 
-	c.Keywords = &endpoint.Keywords{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPKeywords),
-	}
-	c.EntityEndpoints[endpoint.EPKeywords] = c.Keywords
+	c.Keywords = endpoint.NewKeywords(c.Request)
 
-	c.Languages = &endpoint.Languages{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPLanguages),
-	}
-	c.EntityEndpoints[endpoint.EPLanguages] = c.Languages
+	c.Languages = endpoint.NewLanguages(c.Request)
 
-	c.LanguageSupports = &endpoint.LanguageSupports{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPLanguageSupports),
-	}
-	c.EntityEndpoints[endpoint.EPLanguageSupports] = c.LanguageSupports
+	c.LanguageSupports = endpoint.NewLanguageSupports(c.Request)
 
-	c.LanguageSupportTypes = &endpoint.LanguageSupportTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPLanguageSupportTypes),
-	}
-	c.EntityEndpoints[endpoint.EPLanguageSupportTypes] = c.LanguageSupportTypes
+	c.LanguageSupportTypes = endpoint.NewLanguageSupportTypes(c.Request)
 
-	c.MultiplayerModes = &endpoint.MultiplayerModes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPMultiplayerModes),
-	}
-	c.EntityEndpoints[endpoint.EPMultiplayerModes] = c.MultiplayerModes
+	c.MultiplayerModes = endpoint.NewMultiplayerModes(c.Request)
 
-	c.NetworkTypes = &endpoint.NetworkTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPNetworkTypes),
-	}
-	c.EntityEndpoints[endpoint.EPNetworkTypes] = c.NetworkTypes
+	c.NetworkTypes = endpoint.NewNetworkTypes(c.Request)
 
-	c.PlatformFamilies = &endpoint.PlatformFamilies{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformFamilies),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformFamilies] = c.PlatformFamilies
+	c.PlatformFamilies = endpoint.NewPlatformFamilies(c.Request)
 
-	c.PlatformLogos = &endpoint.PlatformLogos{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformLogos),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformLogos] = c.PlatformLogos
+	c.PlatformLogos = endpoint.NewPlatformLogos(c.Request)
 
-	c.Platforms = &endpoint.Platforms{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatforms),
-	}
-	c.EntityEndpoints[endpoint.EPPlatforms] = c.Platforms
+	c.Platforms = endpoint.NewPlatforms(c.Request)
 
-	c.PlatformTypes = &endpoint.PlatformTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformTypes),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformTypes] = c.PlatformTypes
+	c.PlatformTypes = endpoint.NewPlatformTypes(c.Request)
 
-	c.PlatformVersionCompanies = &endpoint.PlatformVersionCompanies{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformVersionCompanies),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformVersionCompanies] = c.PlatformVersionCompanies
+	c.PlatformVersionCompanies = endpoint.NewPlatformVersionCompanies(c.Request)
 
-	c.PlatformVersionReleaseDates = &endpoint.PlatformVersionReleaseDates{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformVersionReleaseDates),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformVersionReleaseDates] = c.PlatformVersionReleaseDates
+	c.PlatformVersionReleaseDates = endpoint.NewPlatformVersionReleaseDates(c.Request)
 
-	c.PlatformVersions = &endpoint.PlatformVersions{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformVersions),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformVersions] = c.PlatformVersions
+	c.PlatformVersions = endpoint.NewPlatformVersions(c.Request)
 
-	c.PlatformWebsites = &endpoint.PlatformWebsites{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlatformWebsites),
-	}
-	c.EntityEndpoints[endpoint.EPPlatformWebsites] = c.PlatformWebsites
+	c.PlatformWebsites = endpoint.NewPlatformWebsites(c.Request)
 
-	c.PlayerPerspectives = &endpoint.PlayerPerspectives{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPlayerPerspectives),
-	}
-	c.EntityEndpoints[endpoint.EPPlayerPerspectives] = c.PlayerPerspectives
+	c.PlayerPerspectives = endpoint.NewPlayerPerspectives(c.Request)
 
-	c.PopularityPrimitives = &endpoint.PopularityPrimitives{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPopularityPrimitives),
-	}
-	c.EntityEndpoints[endpoint.EPPopularityPrimitives] = c.PopularityPrimitives
+	c.PopularityPrimitives = endpoint.NewPopularityPrimitives(c.Request)
 
-	c.PopularityTypes = &endpoint.PopularityTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPPopularityTypes),
-	}
-	c.EntityEndpoints[endpoint.EPPopularityTypes] = c.PopularityTypes
+	c.PopularityTypes = endpoint.NewPopularityTypes(c.Request)
 
-	c.Regions = &endpoint.Regions{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPRegions),
-	}
-	c.EntityEndpoints[endpoint.EPRegions] = c.Regions
+	c.Regions = endpoint.NewRegions(c.Request)
 
-	c.ReleaseDateRegions = &endpoint.ReleaseDateRegions{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPReleaseDateRegions),
-	}
-	c.EntityEndpoints[endpoint.EPReleaseDateRegions] = c.ReleaseDateRegions
+	c.ReleaseDateRegions = endpoint.NewReleaseDateRegions(c.Request)
 
-	c.ReleaseDates = &endpoint.ReleaseDates{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPReleaseDates),
-	}
-	c.EntityEndpoints[endpoint.EPReleaseDates] = c.ReleaseDates
+	c.ReleaseDates = endpoint.NewReleaseDates(c.Request)
 
-	c.ReleaseDateStatuses = &endpoint.ReleaseDateStatuses{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPReleaseDateStatuses),
-	}
-	c.EntityEndpoints[endpoint.EPReleaseDateStatuses] = c.ReleaseDateStatuses
+	c.ReleaseDateStatuses = endpoint.NewReleaseDateStatuses(c.Request)
 
-	c.Screenshots = &endpoint.Screenshots{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPScreenshots),
-	}
-	c.EntityEndpoints[endpoint.EPScreenshots] = c.Screenshots
+	c.Screenshots = endpoint.NewScreenshots(c.Request)
 
-	c.Themes = &endpoint.Themes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPThemes),
-	}
-	c.EntityEndpoints[endpoint.EPThemes] = c.Themes
+	c.Themes = endpoint.NewThemes(c.Request)
 
-	c.Websites = &endpoint.Websites{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPWebsites),
-	}
-	c.EntityEndpoints[endpoint.EPWebsites] = c.Websites
+	c.Websites = endpoint.NewWebsites(c.Request)
 
-	c.WebsiteTypes = &endpoint.WebsiteTypes{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPWebsiteTypes),
-	}
-	c.EntityEndpoints[endpoint.EPWebsiteTypes] = c.WebsiteTypes
+	c.WebsiteTypes = endpoint.NewWebsiteTypes(c.Request)
 
-	c.Webhooks = &endpoint.Webhooks{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPWebhooks),
-	}
+	c.Webhooks = endpoint.NewWebhooks(c.Request)
 
-	c.Search = &endpoint.Search{
-		BaseEndpoint: *endpoint.NewBaseEndpoint(c.Request, endpoint.EPSearch),
-	}
+	c.Search = endpoint.NewSearch(c.Request)
 }