Gen-class addition to core ns