moved helpers in "generic" package