Add keydata in subpackage