Add support to es 0.90.1