Added wrapper and few improvements