Add discovery-related tables