Included support for routing by Id and stopped crushing __ver