Expanded handling to allow value configurability.