Moved Change storing out to more generic location