Updated response class