Started to implement citation storage