Added various collections to track state (including users)