Replace hardcoded addresses