Update to support the latest control