Changes for PR review comments