Refactor SimpleEndpoint class