Updated to match current version of schema
Updated to match announcement of 2013-12-17