Make controller service more generic.