Added wrapper class for js