Refactoring for Meteor 1.0