Added support for dynamic endpoint