update User.java and CollectionPoint.java