Improve wrapper class