diff --git a/Classes/Domain/Model/JobApplication.php b/Classes/Domain/Model/JobApplication.php
index b707d21bad7dd0d405e21f30e53a52a20c9db48c..949cfac941aee4bbc370c540e5b3589ed2b647ac 100644
--- a/Classes/Domain/Model/JobApplication.php
+++ b/Classes/Domain/Model/JobApplication.php
@@ -46,7 +46,7 @@ class JobApplication extends AbstractEntity {
 
 	/**
 	 * @var \SGalinski\SgJobs\Domain\Model\Company $company
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $company;
 
@@ -57,67 +57,67 @@ class JobApplication extends AbstractEntity {
 
 	/**
 	 * @var string $gender
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $gender = 0;
 
 	/**
 	 * @var string $firstName
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $firstName = '';
 
 	/**
 	 * @var string $lastName
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $lastName = '';
 
 	/**
 	 * @var string $street
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $street = '';
 
 	/**
 	 * @var string $city
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $city = '';
 
 	/**
 	 * @var string $zip
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $zip = '';
 
 	/**
 	 * @var string $country
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $country = '';
 
 	/**
 	 * @var string $nationality
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $nationality = '';
 
 	/**
 	 * @var string $education
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $education = '';
 
 	/**
 	 * @var string $birthDate
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $birthDate = '';
 
 	/**
 	 * @var string $phone
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $phone = '';
 
@@ -128,25 +128,26 @@ class JobApplication extends AbstractEntity {
 
 	/**
 	 * @var string $email
-	 * @validate NotEmpty, EmailAddress
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("EmailAddress")
 	 */
 	protected $email = '';
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference $coverLetter
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $coverLetter;
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference $cv
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $cv;
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference $certificate
-	 * @validate NotEmpty
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
 	 */
 	protected $certificate;
 
@@ -157,7 +158,7 @@ class JobApplication extends AbstractEntity {
 
 	/**
 	 * @var bool
-	 * @validate Boolean(is=TRUE)
+	 * @TYPO3\CMS\Extbase\Annotation\Validate("Boolean", options={"is": TRUE})
 	 */
 	protected $privacyPolicy = FALSE;