Move annotations from persistence container package to this package