Moved non-standard value providers outside eav-bundle