Added support for other endpoints