Change settings handling to use Value objects.