Tentative modifications to allow users to speicfy endpoints