Some refactoring.. Renaming and Exposing some configuration end points