Add better monitoring endpoint