Initial reimplementation (storage, response types).