more work on adapting clientstorages