updated to support v1.1.0