Added standard class in wrapper