Added classes in adaper lib