Added generic controller