Update create_keys for the new simpler structure