Base fix

This update makes it easier to change the base paths with new API updates.