Added additional fields and `safeRead`