modifications to support non-gae datastore/channels