Updated old code from Policy to Driver API