Renamed classes, added DatastoreAttribute