Further refined the wizard object system.