API 1.2.9 support