Create new endpoints and change dashboards for #1 and #6 issues