Updated service hook