Add missing bean definitions for analytics