Added Market persistence