Changed prePersist and preUpdate to PrePersist/PreUpdate