Add enable/disable flag and change submitEndpoint based on code review feedback