Added data path flexibility based on hostname