Made Router compatible with newly added Facades