update to match kodex refactors