Changes as per PR review