Changing generic params for consistency