Service and controller updates