Use an interface instead of the struct directly.

Use an interface instead of the struct directly. #508