Add modules support