Updated to work with new Meteor 0.6.5