Moved kv to dedicated file