Added handling of endpoint names for data methods