Add Note 8.0 support