removed unnecessary JPA facet, changed to java 7 facet, improved saving to db