API Refactoring and bootstrapping initial locations