Updated to match ACF5/Pro Compatibility