Move to app-engine data store (1)