Added shifter and FunctionalUnit