Changes related to controller