Adding endpoint fixes