Add Key/Root support