service hook & other changes