Made endpoints configurable