Add endpoint support
Merge remote-tracking branch 'acasademont/endpoint_integration'