Add type declaration to implementations
Fix routing
Port to new plug-ins