Updated for version 1.10.0