Refactor for meteor 0.6.5