Improved class wrapper