Check for modified datastore

This pull request checks for modified datastore values in code.