Add Generic Class Definition and Declaration