Better support for both ACF and ACF PRO