Update to work with ACF 3 and 4