Added modules scheme