Generic class added