BISERVER-10550 - Updating provider classes