Added Save and History implementations