Add more useful information to endpoints