Add index and default route support