Jetpack endpoints refactoring