Updated with new formats for 3.1.