Key-value system added; need user front-end