+ added wrapper class