Preparation for 1.07.09 Update