Additional modules for golden demo