Add back missing service lookup