Change for new scheme of generic version