Added parsing and storing code