[FEATURE] Add 6.0 compatibility