[WIP]Add 1.9.3 support