Refactor Configuration Services.
Merge pull request #111 from cortiz/master

Refactor Configuration Services.