Some small modifications which I made to Controller package