Added new routing options (unimplemented yet)