Making more things generic