Refactoring

Configuration access mechanism have been refactored.