Updated for Meteor 1.0