refactor + service hooks specs update