Added an endpoint and a database option