AMGA-5 Added support for provider code