[REF] Refactory to support 8.0 API