Added models and defs for datastore tables