Address comments for changes