Updated to work with Meteor 0.6.5