Work on wrapper class