[DB MIGRATION REQ'D] Become trial-aware