Refactor Google App Engine DataStore