Make one more method generic