Add type declaration to implementations
Port to new plug-ins