Added wrapper, cleanup