Enhanced class