Add data stores solution