Upgraded to support Meteor 0.9.x