change mapping to use version objects