Switch to new Meteor format