Change controller to use the "database" system