Add S820 support