Should be using the new CF mappers.