Added missing dependencies for message generation