Update the way we load controllers