Additional changes for PR review