rework generic resolving