Add column model and tests