Rework the Clamp db model