add modules support