Refactor, new schemas for ETA and users.