Added appropiate controller hirarchy and methods.