Corrected gateway_manager, ...
Added Router plugins
Added registrant router plugin