Shouldn't this be generic as well now?