Clamp: Use "common.repository" framework