Enhancement in provider interface and implementation