Common controller updated