Remove KeysContainer trait, use Keys again