Refactored to use Endpoint class when building Operations
Removed DS prefix from class names