Adding Wheel and Wheel Manager + small updated