Markup and adding new endpoints