Some Adjustements for the endpoint file