Improve endpoint scaffold