adding wrapper support & env path fix