added some new functions
changed to javax-persistence-annotations