Improved player wrapper system