Refactored Configuration Items code.