Adds dispatch tables and rich interfaces