Added generic term controller