Switched out generic typing.