Update controller and services w/ the new pattern