Updated Shifter class