Add Multiprotocol definitions and more param handling.