Added the new Settings JPA classes and updated the old settings manager