Updated for Meteor v1.0.1