Address second set of review comments