optimize endpoint operations

Look up this word on Fala2Me