[NUCRDBMS-787] Add generics to args to avoid casts later