Changes for review comments