Changed feature wrapper implementation