Removed hardcoded addresses