Add JPA Annotations (need a little revision and comments)