Objects consistency updates
4 files changed