Added Clients/Stores scaffolds