Fix runtime error
Add support for adding endpoints
Add endpoint cleaning
Merge branch 'feature/feature/endpoints' into develop