Updated to match elastica v0.90.7.0