Made class public to match vanilla