Fixed class definition on wrapper