Modified files as per PM doc