Made enhancement class public