Added a basic key value model for adapters etc.