Using ValueEnforcer where applicable