Refactored configuring and configuration items