I don't like either be too much specific on generic class name, but I don't mind to apply this change.