add optimist support