Renamed ContentValue to more generic Column for use with both
AnnotationContentValuesMapper and AnnotationRowMapper.