Enhanced endpoint approach to be easy to configurate. Remove double config loading