Tweak PrePersist & PreUpdate