Updated for version 1.11.0