Refactoring of Endpoint_v1_General