Updated with latest API formats 

Up to date as of Oct 3, 2014