Add fetch back into controller setup