More work on Keys and Stats imports