Implemented review comments to set prefix based on the provider