Fixed lookup. Refactored config module. Removed unused service.