Working on iron-router compatibility