Add support for endpoint options