From 5d7a7905f4212c09e6c625d642bbfdc3ec22e7a3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 13 Mar 2018 23:05:44 +0100
Subject: [PATCH] Please cherry-pick/rename: - Headquarter is enough for bean
 name (please rename) - removed some no longer recommended business methods -
 removed no longer used private methods - made some local variables final
 which helps the Java compiler in optimization   of resulting byte-code -
 added session EJB for user activity - other improvements (?) - changed
 copyright to Free Software Foundation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/java/log4j2.xml                           |   2 +-
 .../contact/JobsAdminContactSessionBean.java  |   2 +-
 .../model/contact/JobsContactSessionBean.java | 121 +---------
 .../JobsAdminContactPhoneSessionBean.java     |   2 +-
 .../JobsAdminBusinessDataSessionBean.java     |  14 +-
 .../JobsBusinessDataSessionBean.java          |   2 +-
 .../JobsAdminBranchOfficeSessionBean.java     |   4 +-
 .../JobsBranchOfficeSessionBean.java          |   2 +-
 .../JobsAdminDepartmentSessionBean.java       |  18 +-
 .../department/JobsDepartmentSessionBean.java |   2 +-
 .../JobsAdminCompanyEmployeeSessionBean.java  | 207 +++++++++++++++++-
 .../JobsCompanyEmployeeSessionBean.java       |   4 +-
 .../JobsAdminHeadquartersSessionBean.java     |  48 ++--
 .../JobsHeadquartersSessionBean.java          |  12 +-
 .../JobsAdminOpeningTimesSessionBean.java     |   2 +-
 .../JobsOpeningTimesSessionBean.java          |   2 +-
 .../data/JobsAdminCountrySingletonBean.java   |   2 +-
 .../model/data/JobsCountrySingletonBean.java  |   2 +-
 .../JobsAdminMobileProviderSessionBean.java   |   2 +-
 .../JobsMobileProviderSingletonBean.java      |   2 +-
 .../phone/JobsAdminPhoneSessionBean.java      |   2 +-
 .../phone/JobsPhoneSessionBean.java           | 139 +-----------
 .../model/user/JobsAdminUserSessionBean.java  |   6 +-
 .../model/user/JobsUserSessionBean.java       |  73 +-----
 .../JobsUserActivityLogMessageBean.java       | 196 +++++++++--------
 .../JobsUserEmailChangeSessionBean.java       |   2 +-
 .../JobsUserPasswordHistorySessionBean.java   |   2 +-
 .../user/login/JobsUserLoginSessionBean.java  |   3 +-
 .../JobsUserRegistrationSessionBean.java      |   2 +-
 .../resendlink/JobsResendLinkSessionBean.java |   2 +-
 30 files changed, 410 insertions(+), 469 deletions(-)
 rename src/java/org/mxchange/jcontactsbusiness/model/{headquarters => headquarter}/JobsAdminHeadquartersSessionBean.java (68%)
 rename src/java/org/mxchange/jcontactsbusiness/model/{headquarters => headquarter}/JobsHeadquartersSessionBean.java (75%)

diff --git a/src/java/log4j2.xml b/src/java/log4j2.xml
index 98e9a65..90439ed 100644
--- a/src/java/log4j2.xml
+++ b/src/java/log4j2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2016, 2017 Roland Häder
+Copyright (C) 2016 - 2018 Free Software Foundation
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java
index 41057be..a77eae0 100644
--- a/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java
index 4fec75f..a6d97d6 100644
--- a/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -66,62 +66,6 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont
 		return contacts;
 	}
 
-	@Override
-	@SuppressWarnings ("unchecked")
-	public List<String> allEmailAddresses () {
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList - CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Create query instance
-		final Query query = this.getEntityManager().createNamedQuery("AllContactEmailAddresses"); //NOI18N
-
-		// Get list
-		final List<String> emailAddresses = query.getResultList();
-
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: emailAddresses.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddresses.size())); //NOI18N
-
-		// Return it
-		return emailAddresses;
-	}
-
-	@Override
-	public boolean isEmailAddressRegistered (final String emailAddress) {
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.isEmailAddressRegistered: emailAddress={1} - CALLED!", this.getClass().getSimpleName(), emailAddress)); //NOI18N
-
-		// The email address should be valid
-		if (null == emailAddress) {
-			// Is null
-			throw new NullPointerException("emailAddress is null"); //NOI18N
-		} else if (emailAddress.isEmpty()) {
-			// Is empty
-			throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
-		}
-
-		// Default is not found
-		boolean isFound = false;
-
-		try {
-			// Ask other method for contact instance
-			final Contact contact = this.findContactByEmailAddress(emailAddress);
-
-			// Log debug message
-			this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.isEmailAddressRegistered: Found contact={1} for emailAddress={2}", this.getClass().getSimpleName(), contact, emailAddress)); //NOI18N
-
-			// It is found ...
-			isFound = true;
-		} catch (final ContactNotFoundException ex) {
-			// @TODO Was not found, log exception for spam check?
-		}
-
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.isEmailAddressRegistered: isFound={1} - EXIT!", this.getClass().getSimpleName(), isFound)); //NOI18N
-
-		// Return status
-		return isFound;
-	}
-
 	@Override
 	public Contact lookupContact (final Contact contact) {
 		// Log trace message
@@ -160,7 +104,7 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont
 		// Loop through all
 		while (iterator.hasNext()) {
 			// Get contact
-			Contact next = iterator.next();
+			final Contact next = iterator.next();
 
 			// Is same contact?
 			if ((Objects.equals(contact, next)) || (ContactUtils.isSameContact(contact, next))) {
@@ -201,7 +145,7 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont
 		this.setAllContactPhoneEntriesUpdated(contact, isCellphoneUnlinked, isLandlineUnlinked, isFaxUnlinked);
 
 		// Merge mobile, land-line and fix
-		Contact detachedContact = this.mergeContactData(contact);
+		final Contact detachedContact = this.mergeContactData(contact);
 
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: detachedContact={1} - EXIT!", this.getClass().getSimpleName(), detachedContact)); //NOI18N
@@ -228,12 +172,12 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont
 		}
 
 		// Is cell phone/land-line/fax number unlinked?
-		boolean isCellphoneUnlinked = (contact.getContactMobileNumber() == null);
-		boolean isLandLineUnlinked = (contact.getContactLandLineNumber() == null);
-		boolean isFaxUnlinked = (contact.getContactFaxNumber() == null);
+		final boolean isCellphoneUnlinked = (contact.getContactMobileNumber() == null);
+		final boolean isLandLineUnlinked = (contact.getContactLandLineNumber() == null);
+		final boolean isFaxUnlinked = (contact.getContactFaxNumber() == null);
 
 		// Call other Method
-		Contact detachedContact = this.updateContactData(contact, isCellphoneUnlinked, isLandLineUnlinked, isFaxUnlinked);
+		final Contact detachedContact = this.updateContactData(contact, isCellphoneUnlinked, isLandLineUnlinked, isFaxUnlinked);
 
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: detachedContact={1} - EXIT!", this.getClass().getSimpleName(), detachedContact)); //NOI18N
@@ -242,57 +186,6 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont
 		return detachedContact;
 	}
 
-	/**
-	 * Returns a contact instance which has the given email address.
-	 * <p>
-	 * @param emailAddress Email address
-	 * <p>
-	 * @return Contact instance
-	 * <p>
-	 * @throws ContactNotFoundException If the contact was not found
-	 */
-	private Contact findContactByEmailAddress (final String emailAddress) throws ContactNotFoundException {
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findContactByEmailAddress: emailAddress={1} - CALLED!", this.getClass().getSimpleName(), emailAddress)); //NOI18N
-
-		// The parameter must be valid
-		if (null == emailAddress) {
-			// Throw NPE
-			throw new NullPointerException("emailAddress is null"); //NOI18N
-		} else if (emailAddress.isEmpty()) {
-			// Not valid
-			throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
-		}
-
-		// Get query instance
-		final Query query = this.getEntityManager().createNamedQuery("SearchContactByEmailAddress", UserContact.class); //NOI18N
-
-		// Set parameter and limit
-		query.setParameter("emailAddress", emailAddress); //NOI18N
-		query.setMaxResults(1);
-
-		// Init contact instance
-		final Contact contact;
-
-		// Try to find a result
-		try {
-			// Find a single result
-			contact = (Contact) query.getSingleResult();
-
-			// Log trace message
-			this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findContactByEmailAddress: Found contact={1}", this.getClass().getSimpleName(), contact)); //NOI18N
-		} catch (final NoResultException ex) {
-			// No result found
-			throw new ContactNotFoundException(emailAddress, ex);
-		}
-
-		// Log trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findContactByEmailAddress: contact={1} - EXIT!", this.getClass().getSimpleName(), contact)); //NOI18N
-
-		// Return found instance
-		return contact;
-	}
-
 	/**
 	 * Returns a contact instance which has the given id number.
 	 * <p>
diff --git a/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java
index 6657f5f..9f9ada3 100644
--- a/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
index 13d752e..0d5635e 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -23,9 +23,10 @@ import java.util.Objects;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.model.employee.Employable;
+import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.employee.Employable;
 
 /**
  * An administrative stateless session bean for business data
@@ -101,6 +102,15 @@ public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean imple
 			basicData.setCompanyContactEmployee(managedEmployee);
 		}
 
+		// Is a headquarter set?
+		if (basicData.getCompanyHeadquarterData()instanceof Headquarter) {
+			// Get managed instance
+			final Headquarter managedHeadquarter = this.createManaged(basicData.getCompanyHeadquarterData());
+
+			// Set it back
+			basicData.setCompanyHeadquarterData(managedHeadquarter);
+		}
+
 		// Set created timestamps for any assigned numbers
 		this.setAllPhoneEntriesCreated(basicData);
 
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
index 29b3373..9aab0df 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
index 5cc7566..bcefcf4 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -22,11 +22,11 @@ import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 
 /**
  * A stateless session bean for administrative branch office purposes
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
index d454a0b..48f48d0 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
index eacd81a..1672662 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -22,12 +22,12 @@ import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+import org.mxchange.jcontactsbusiness.model.employee.Employable;
+import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.employee.Employable;
-import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
 
 /**
  * A stateless session bean for administrative department purposes
@@ -106,13 +106,13 @@ public class JobsAdminDepartmentSessionBean extends BaseJobsDatabaseBean impleme
 			department.setDepartmentBranchOffice(managedBranchOffice);
 		}
 
-		// Is headquarters set?
-		if (department.getDepartmentHeadquarters() instanceof Headquarter) {
-			// Get managed headquarters
-			final Headquarter managedHeadquarters = this.createManaged(department.getDepartmentHeadquarters());
+		// Is headquarter set?
+		if (department.getDepartmentHeadquarter() instanceof Headquarter) {
+			// Get managed headquarter
+			final Headquarter managedHeadquarter = this.createManaged(department.getDepartmentHeadquarter());
 
 			// Set it back
-			department.setDepartmentHeadquarters(managedHeadquarters);
+			department.setDepartmentHeadquarter(managedHeadquarter);
 		}
 
 		// Is lead employee set?
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsDepartmentSessionBean.java
index 57fe587..5758c15 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsDepartmentSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsDepartmentSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
index c5ecd6f..b03421f 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,8 +16,20 @@
  */
 package org.mxchange.jcontactsbusiness.model.employee;
 
+import java.text.MessageFormat;
+import java.util.Date;
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
+import org.mxchange.jcontacts.model.contact.Contact;
+import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+import org.mxchange.jcontactsbusiness.model.department.Department;
+import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
+import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
+import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * A stateless bean for administrative purposes for company employees.
@@ -32,6 +44,12 @@ public class JobsAdminCompanyEmployeeSessionBean extends BaseJobsDatabaseBean im
 	 */
 	private static final long serialVersionUID = 26_458_796_703_761L;
 
+	/**
+	 * EJB for general company employee purposes
+	 */
+	@EJB (lookup = "java:global/jjobs-ejb/employee!org.mxchange.jcontactsbusiness.model.employee.EmployeeSessionBeanRemote")
+	private EmployeeSessionBeanRemote employeeBean;
+
 	/**
 	 * Default constructor
 	 */
@@ -39,4 +57,191 @@ public class JobsAdminCompanyEmployeeSessionBean extends BaseJobsDatabaseBean im
 		super();
 	}
 
+	@Override
+	public Employable addEmployee (final Employable employee) throws EmployeeAlreadyAddedException {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addEmployee(): employee={1} - CALLED!", this.getClass().getSimpleName(), employee)); //NOI18N
+
+		// Validate parameter
+		if (null == employee) {
+			// Throw NPE
+			throw new NullPointerException("employee is null"); //NOI18N
+		} else if (employee.getEmployeeId() != null) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeId={0} is unexpected.", employee.getEmployeeId())); //NOI18N
+		} else if (employee.getEmployeeCompany() == null) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeeCompany is null"); //NOI18N
+		} else if (employee.getEmployeeCompany().getBasicDataId() == null) {
+			// Throw it again
+			throw new NullPointerException("employee.employeeCompany.basicDataId is null"); //NOI18N
+		} else if (employee.getEmployeeCompany().getBasicDataId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeCompany.basicDataId={0} is invalid.", employee.getEmployeeCompany().getBasicDataId())); //NOI18N
+		} else if (employee.getEmployeeBranchOffice() == null && employee.getEmployeeDepartment() == null && employee.getEmployeeHeadquarter() == null) {
+			// At least one must be set
+			throw new NullPointerException("employee.employeeBranchOffice, employee.employeeDepartment and employee.employeeHeadquarter is null"); //NOI18N
+		} else if (employee.getEmployeeBranchOffice() != null && employee.getEmployeeBranchOffice().getBranchId() == null) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeeBranchOffice.branchId is null"); //NOI18N
+		} else if (employee.getEmployeeBranchOffice() != null && employee.getEmployeeBranchOffice().getBranchId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeBranchOffice.branchId={0} is invalid.", employee.getEmployeeBranchOffice().getBranchId())); //NOI18N
+		} else if (employee.getEmployeeDepartment() != null && employee.getEmployeeDepartment().getDepartmentId() == null) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeeDepartment.departmentId is null"); //NOI18N
+		} else if (employee.getEmployeeDepartment() != null && employee.getEmployeeDepartment().getDepartmentId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeDepartment.departmentId={0} is invalid.", employee.getEmployeeDepartment().getDepartmentId())); //NOI18N
+		} else if (employee.getEmployeeHeadquarter() != null && employee.getEmployeeHeadquarter().getHeadquarterId() == null) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeeHeadquarter.headquarterId is null"); //NOI18N
+		} else if (employee.getEmployeeHeadquarter() != null && employee.getEmployeeHeadquarter().getHeadquarterId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeHeadquarter.headquarterId={0} is invalid.", employee.getEmployeeHeadquarter().getHeadquarterId())); //NOI18N
+		} else if ((employee.getEmployeePersonalData() == null) && (employee.getEmployeeNumber() == null)) {
+			// Both are null
+			throw new NullPointerException("employee.employeePersonalData and employee.employeeNumber are null"); //NOI18N
+		} else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() == null)) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeePersonalData.contactId is null"); //NOI18N
+		} else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() < 1)) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeePersonalData.contactId={0} is invalid.", employee.getEmployeePersonalData().getContactId())); //NOI18N
+		} else if ((employee.getEmployeeNumber() != null) && (employee.getEmployeeNumber().isEmpty())) {
+			// Throw it again
+			throw new IllegalArgumentException("employee.employeeNumber is empty"); //NOI18N
+		} else if ((employee.getEmployeeMobileNumber() != null) && (employee.getEmployeeMobileNumber().getPhoneId() != null)) {
+			// Throw once more
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeMobileNumber.phoneId={0} is unexpected.", employee.getEmployeeMobileNumber().getPhoneId())); //NOI18N
+		} else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() == null)) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeePersonalData.contactId is null"); //NOI18N
+		} else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() < 1)) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeePersonalData.contactId={0} is unexpected.", employee.getEmployeePersonalData().getContactId())); //NOI18N
+		} else if ((employee.getEmployeePosition() != null) && (employee.getEmployeePosition().getJobPositionId() == null)) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeePosition.jobPositionId is null"); //NOI18N
+		} else if ((employee.getEmployeePosition() != null) && (employee.getEmployeePosition().getJobPositionId() < 1)) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeePosition.jobPositionId={0} is unexpected.", employee.getEmployeePosition().getJobPositionId())); //NOI18N
+		} else if ((employee.getEmployeeUserOwner() != null) && (employee.getEmployeeUserOwner().getUserId() == null)) {
+			// Throw NPE
+			throw new NullPointerException("employee.employeeUserOwner.userId is null"); //NOI18N
+		} else if ((employee.getEmployeeUserOwner() != null) && (employee.getEmployeeUserOwner().getUserId() < 1)) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("employee.employeeUserOwner.userId={0} is unexpected.", employee.getEmployeeUserOwner().getUserId())); //NOI18N
+		} else if (this.isEmployeeAdded(employee)) {
+			// Throw exception
+			throw new EmployeeAlreadyAddedException();
+		}
+
+		// Make company (basic data) managed
+		employee.setEmployeeCompany(this.createManaged(employee.getEmployeeCompany()));
+
+		// Is branch office set?
+		if (employee.getEmployeeBranchOffice() instanceof BranchOffice) {
+			// Then make it managed
+			final BranchOffice branchOffice = this.createManaged(employee.getEmployeeBranchOffice());
+
+			// Set it back
+			employee.setEmployeeBranchOffice(branchOffice);
+		}
+
+		// Is department set?
+		if (employee.getEmployeeDepartment() instanceof Department) {
+			// Then make it managed
+			final Department department = this.createManaged(employee.getEmployeeDepartment());
+
+			// Set it back
+			employee.setEmployeeDepartment(department);
+		}
+
+		// Is headquarter set?
+		if (employee.getEmployeeHeadquarter() instanceof Headquarter) {
+			// Then make it managed
+			final Headquarter headquarter = this.createManaged(employee.getEmployeeHeadquarter());
+
+			// Set it back
+			employee.setEmployeeHeadquarter(headquarter);
+		}
+
+		// Is personal data set?
+		if (employee.getEmployeePersonalData() instanceof Contact) {
+			// Then make it managed
+			final Contact contact = this.createManaged(employee.getEmployeePersonalData());
+
+			// Set it back
+			employee.setEmployeePersonalData(contact);
+		}
+
+		// Is headquarter set?
+		if (employee.getEmployeePosition() instanceof JobPosition) {
+			// Then make it managed
+			final JobPosition jobPosition = this.createManaged(employee.getEmployeePosition());
+
+			// Set it back
+			employee.setEmployeePosition(jobPosition);
+		}
+
+		// Is headquarter set?
+		if (employee.getEmployeeUserOwner() instanceof User) {
+			// Then make it managed
+			final User user = this.createManaged(employee.getEmployeeUserOwner());
+
+			// Set it back
+			employee.setEmployeeUserOwner(user);
+		}
+
+		// Is mobile number set?
+		if (employee.getEmployeeMobileNumber() instanceof DialableMobileNumber) {
+			// Yes, then set created there as well
+			employee.getEmployeeMobileNumber().setPhoneEntryCreated(new Date());
+
+			// Make mobile provider managed
+			final MobileProvider mobileProvider = this.createManaged(employee.getEmployeeMobileNumber().getMobileProvider());
+
+			// Set it back
+			employee.getEmployeeMobileNumber().setMobileProvider(mobileProvider);
+		}
+
+		// Set created timestamp
+		employee.setEmployeeCreated(new Date());
+
+		// Persist it
+		this.getEntityManager().persist(employee);
+
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addEmployee(): employee.employeeId={1} - EXIT!", this.getClass().getSimpleName(), employee.getEmployeeId())); //NOI18N
+
+		// Return it
+		return employee;
+	}
+
+	/**
+	 * Checks whether employee is already added
+	 * <p>
+	 * @param employee Employee to be checked
+	 * <p>
+	 * @return Whether employee is already added
+	 */
+	private boolean isEmployeeAdded (final Employable employee) {
+		// Default is not added
+		boolean isFound = false;
+
+		// Check all entries
+		for (final Employable otherEmployee : this.employeeBean.allEmployees()) {
+			// Is same found?
+			if (Employees.isSameEmployeeFound(employee, otherEmployee)) {
+				// Found it
+				isFound = true;
+				break;
+			}
+		}
+
+		// Return flag
+		return isFound;
+	}
+
 }
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
index 14242f1..89ae0a5 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -34,7 +34,7 @@ public class JobsCompanyEmployeeSessionBean extends BaseJobsDatabaseBean impleme
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 26_458_796_703_761L;
+	private static final long serialVersionUID = 26_458_796_703_762L;
 
 	/**
 	 * Default constructor
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsAdminHeadquartersSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquartersSessionBean.java
similarity index 68%
rename from src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsAdminHeadquartersSessionBean.java
rename to src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquartersSessionBean.java
index 5b64911..291a76d 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsAdminHeadquartersSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquartersSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jcontactsbusiness.model.headquarters;
+package org.mxchange.jcontactsbusiness.model.headquarter;
 
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
-import org.mxchange.jcontactsbusiness.exceptions.headquarters.HeadquartersAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.exceptions.headquarter.HeadquarterAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
@@ -33,7 +33,7 @@ import org.mxchange.jusercore.model.user.User;
  * @author Roland Häder<roland@mxchange.org>
  */
 @Stateless (name = "adminHeadquarter", description = "An administrative statless bean for handling branch office data (all)")
-public class JobsAdminHeadquartersSessionBean extends BaseJobsDatabaseBean implements AdminHeadquartersSessionBeanRemote {
+public class JobsAdminHeadquarterSessionBean extends BaseJobsDatabaseBean implements AdminHeadquarterSessionBeanRemote {
 
 	/**
 	 * Serial number
@@ -43,63 +43,63 @@ public class JobsAdminHeadquartersSessionBean extends BaseJobsDatabaseBean imple
 	/**
 	 * General branch office bean
 	 */
-	@EJB (lookup = "java:global/jjobs-ejb/headquarters!org.mxchange.jcontactsbusiness.model.headquarters.HeadquarterSessionBeanRemote")
-	private HeadquartersSessionBeanRemote headquartersBean;
+	@EJB (lookup = "java:global/jjobs-ejb/headquarter!org.mxchange.jcontactsbusiness.model.headquarter.HeadquarterSessionBeanRemote")
+	private HeadquarterSessionBeanRemote headquarterBean;
 
 	/**
 	 * Default constructor
 	 */
-	public JobsAdminHeadquartersSessionBean () {
+	public JobsAdminHeadquarterSessionBean () {
 		// Call super constructor
 		super();
 	}
 
 	@Override
-	public Headquarter addHeadquarters (final Headquarter headquarter) throws HeadquartersAlreadyAddedException {
+	public Headquarter addHeadquarter (final Headquarter headquarter) throws HeadquarterAlreadyAddedException {
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addHeadquarters(): headquarter={1} - CALLED!", this.getClass().getSimpleName(), headquarter)); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addHeadquarter(): headquarter={1} - CALLED!", this.getClass().getSimpleName(), headquarter)); //NOI18N
 
 		// Validate parameter
 		if (null == headquarter) {
 			// Throw NPE
 			throw new NullPointerException("headquarter is null"); //NOI18N
-		} else if (headquarter.getHeadquartersId() instanceof Long) {
+		} else if (headquarter.getHeadquarterId() instanceof Long) {
 			// Should not happen
 			throw new IllegalArgumentException("headquarter.branchId should not be set."); //NOI18N
 		} else if (this.isHeadquarterFound(headquarter)) {
 			// Already added, abort here
-			throw new HeadquartersAlreadyAddedException(headquarter);
+			throw new HeadquarterAlreadyAddedException(headquarter);
 		}
 
 		// Add created timestamp
-		headquarter.setHeadquartersCreated(new Date());
+		headquarter.setHeadquarterCreated(new Date());
 
 		// Is user instance set?
-		if (headquarter.getHeadquartersUserOwner() instanceof User) {
+		if (headquarter.getHeadquarterUserOwner() instanceof User) {
 			// Get managed instance back
-			final User managedUser = this.createManaged(headquarter.getHeadquartersUserOwner());
+			final User managedUser = this.createManaged(headquarter.getHeadquarterUserOwner());
 
 			// Set it back in branch office
-			headquarter.setHeadquartersUserOwner(managedUser);
+			headquarter.setHeadquarterUserOwner(managedUser);
 		}
 
 		// Is user instance set?
-		if (headquarter.getHeadquartersCountry() instanceof Country) {
+		if (headquarter.getHeadquarterCountry() instanceof Country) {
 			// Get managed instance back
-			final Country managedCountry = this.createManaged(headquarter.getHeadquartersCountry());
+			final Country managedCountry = this.createManaged(headquarter.getHeadquarterCountry());
 
 			// Set it back in branch office
-			headquarter.setHeadquartersCountry(managedCountry);
+			headquarter.setHeadquarterCountry(managedCountry);
 		}
 
 		// Set "created" timestamp on any number assigned
 		this.setAllPhoneEntriesCreated(headquarter);
 
 		// Get opening times
-		final List<OpeningTime> openingTimes = headquarter.getHeadquartersOpeningTimes();
+		final List<OpeningTime> openingTimes = headquarter.getHeadquarterOpeningTimes();
 
 		// Debugging:
-		this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.addHeadquarters(): headquarter.headquarterOpeningTimes={1}", this.getClass().getSimpleName(), openingTimes));
+		this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.addHeadquarter(): headquarter.headquarterOpeningTimes={1}", this.getClass().getSimpleName(), openingTimes));
 
 		// Is opening times set and not empty?
 		if ((openingTimes instanceof List) && (!openingTimes.isEmpty())) {
@@ -107,14 +107,14 @@ public class JobsAdminHeadquartersSessionBean extends BaseJobsDatabaseBean imple
 			this.setAllOpeningTimesCreated(openingTimes);
 		} else {
 			// Set all to null
-			headquarter.setHeadquartersOpeningTimes(null);
+			headquarter.setHeadquarterOpeningTimes(null);
 		}
 
 		// Persist it
 		this.getEntityManager().persist(headquarter);
 
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addHeadquarters(): headquarter.branchId={1} - EXIT!", this.getClass().getSimpleName(), headquarter.getHeadquartersId())); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addHeadquarter(): headquarter.branchId={1} - EXIT!", this.getClass().getSimpleName(), headquarter.getHeadquarterId())); //NOI18N
 
 		// Return updated instance
 		return headquarter;
@@ -125,13 +125,13 @@ public class JobsAdminHeadquartersSessionBean extends BaseJobsDatabaseBean imple
 	 * (persisted) list is being loaded and each address is being matched
 	 * against the given branch office's address.
 	 * <p>
-	 * @param headquarter Headquarters office being checked
+	 * @param headquarter Headquarter office being checked
 	 * <p>
 	 * @return Whether it has been found
 	 */
 	private boolean isHeadquarterFound (final Headquarter headquarter) {
 		// Get whole list
-		final List<Headquarter> headquarters = this.headquartersBean.allHeadquarters();
+		final List<Headquarter> headquarters = this.headquarterBean.allHeadquarters();
 
 		// Default is not found
 		boolean isFound = false;
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsHeadquartersSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsHeadquartersSessionBean.java
similarity index 75%
rename from src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsHeadquartersSessionBean.java
rename to src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsHeadquartersSessionBean.java
index 10668c3..1624b84 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/headquarters/JobsHeadquartersSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsHeadquartersSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -14,21 +14,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jcontactsbusiness.model.headquarters;
+package org.mxchange.jcontactsbusiness.model.headquarter;
 
+import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import java.text.MessageFormat;
 import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.Query;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
+import org.mxchange.jcontactsbusiness.model.headquarter.HeadquarterSessionBeanRemote;
 
 /**
- * A stateless session bean for general headquarters purposes
+ * A stateless session bean for general headquarter purposes
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Stateless (name = "headquarters", description = "A general statless bean for handling headquarters data (all)")
-public class JobsHeadquartersSessionBean extends BaseJobsDatabaseBean implements HeadquartersSessionBeanRemote {
+@Stateless (name = "headquarter", description = "A general statless bean for handling headquarter data (all)")
+public class JobsHeadquarterSessionBean extends BaseJobsDatabaseBean implements HeadquarterSessionBeanRemote {
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsAdminOpeningTimesSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsAdminOpeningTimesSessionBean.java
index 0f12041..6b57755 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsAdminOpeningTimesSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsAdminOpeningTimesSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsOpeningTimesSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsOpeningTimesSessionBean.java
index c10e0d1..ffdb86f 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsOpeningTimesSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/JobsOpeningTimesSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017, 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcountry/model/data/JobsAdminCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/JobsAdminCountrySingletonBean.java
index a2cd638..24c8803 100644
--- a/src/java/org/mxchange/jcountry/model/data/JobsAdminCountrySingletonBean.java
+++ b/src/java/org/mxchange/jcountry/model/data/JobsAdminCountrySingletonBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java
index 71a874b..9af3476 100644
--- a/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java
+++ b/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java
index f53b33e..9f48ec6 100644
--- a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java
index e881ffd..aaf852c 100644
--- a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
index 8607fbb..54b425d 100644
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java
index 5684d99..6b53d1e 100644
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,14 +21,12 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.Query;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
-import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber;
-import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote;
 
 /**
  * A general phone EJB
@@ -53,15 +51,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS
 
 	@SuppressWarnings ("unchecked")
 	@Override
-	public List<org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber> allFaxNumbers () {
+	public List<DialableFaxNumber> allFaxNumbers () {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
 		// Get query
-		final Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", org.mxchange.jphone.model.phonenumbers.fax.FaxNumber.class); //NOI18N
+		final Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N
 
 		// Get list from it
-		final List<org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber> list = query.getResultList();
+		final List<DialableFaxNumber> list = query.getResultList();
 
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -72,15 +70,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS
 
 	@SuppressWarnings ("unchecked")
 	@Override
-	public List<org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber> allLandLineNumbers () {
+	public List<DialableLandLineNumber> allLandLineNumbers () {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
 		// Get query
-		final Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber.class); //NOI18N
+		final Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N
 
 		// Get list from it
-		final List<org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber> list = query.getResultList();
+		final List<DialableLandLineNumber> list = query.getResultList();
 
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -91,15 +89,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS
 
 	@SuppressWarnings ("unchecked")
 	@Override
-	public List<org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber> allMobileNumbers () {
+	public List<DialableMobileNumber> allMobileNumbers () {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
 		// Get query
-		final Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber.class); //NOI18N
+		final Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", MobileNumber.class); //NOI18N
 
 		// Get list from it
-		final List<org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber> list = query.getResultList();
+		final List<DialableMobileNumber> list = query.getResultList();
 
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -108,121 +106,4 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS
 		return list;
 	}
 
-	@Override
-	public org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber findFaxNumberById (final Long faxNumberId) throws PhoneEntityNotFoundException {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), faxNumberId)); //NOI18N
-
-		// The id number should be valid
-		if (null == faxNumberId) {
-			// Throw NPE
-			throw new NullPointerException("faxNumberId is null"); //NOI18N
-		} else if (faxNumberId < 1) {
-			// Not valid
-			throw new IllegalArgumentException(MessageFormat.format("faxNumberId={0} is not valid.", faxNumberId)); //NOI18N
-		}
-
-		// Now find it
-		final Query query = this.getEntityManager().createNamedQuery("SearchFaxNumberId", org.mxchange.jphone.model.phonenumbers.fax.FaxNumber.class); //NOI18N
-
-		// Set parameter
-		query.setParameter("faxNumberId", faxNumberId); //NOI18N
-
-		// Init instance
-		final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber;
-
-		// Try to get a result
-		try {
-			// Get a single result
-			faxNumber = (org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) query.getSingleResult();
-		} catch (NoResultException ex) {
-			// The entry was not found, so throw it again
-			throw new PhoneEntityNotFoundException(faxNumberId, ex);
-		}
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
-
-		// Return found instance
-		return faxNumber;
-	}
-
-	@Override
-	public org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber findLandLineNumberById (final Long landLineNumberId) throws PhoneEntityNotFoundException {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), landLineNumberId)); //NOI18N
-
-		// The id number should be valid
-		if (null == landLineNumberId) {
-			// Throw NPE
-			throw new NullPointerException("landLineNumberId is null"); //NOI18N
-		} else if (landLineNumberId < 1) {
-			// Not valid
-			throw new IllegalArgumentException(MessageFormat.format("landLineNumberId={0} is not valid.", landLineNumberId)); //NOI18N
-		}
-
-		// Now find it
-		final Query query = this.getEntityManager().createNamedQuery("SearchLandLineNumberId", org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber.class); //NOI18N
-
-		// Set parameter
-		query.setParameter("landLineNumberId", landLineNumberId); //NOI18N
-
-		// Init instance
-		final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber;
-
-		// Try to get a result
-		try {
-			// Get a single result
-			landLineNumber = (org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) query.getSingleResult();
-		} catch (NoResultException ex) {
-			// The entry was not found, so throw it again
-			throw new PhoneEntityNotFoundException(landLineNumberId, ex);
-		}
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), landLineNumber)); //NOI18N
-
-		// Return found instance
-		return landLineNumber;
-	}
-
-	@Override
-	public org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber findMobileNumberById (final Long mobileNumberId) throws PhoneEntityNotFoundException {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), mobileNumberId)); //NOI18N
-
-		// The id number should be valid
-		if (null == mobileNumberId) {
-			// Throw NPE
-			throw new NullPointerException("mobileNumberId is null"); //NOI18N
-		} else if (mobileNumberId < 1) {
-			// Not valid
-			throw new IllegalArgumentException(MessageFormat.format("mobileNumberId={0} is not valid.", mobileNumberId)); //NOI18N
-		}
-
-		// Now find it
-		final Query query = this.getEntityManager().createNamedQuery("SearchMobileNumberId", org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber.class); //NOI18N
-
-		// Set parameter
-		query.setParameter("mobileNumberId", mobileNumberId); //NOI18N
-
-		// Init instance
-		final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobile;
-
-		// Try to get a result
-		try {
-			// Get a single result
-			mobile = (org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) query.getSingleResult();
-		} catch (NoResultException ex) {
-			// The entry was not found, so throw it again
-			throw new PhoneEntityNotFoundException(mobileNumberId, ex);
-		}
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), mobile)); //NOI18N
-
-		// Return found instance
-		return mobile;
-	}
-
 }
diff --git a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java
index df58398..4f804a0 100644
--- a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -69,7 +69,7 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addUser: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
 
-		// user should not be null
+		// Validate parameter
 		if (null == user) {
 			// Abort here
 			throw new NullPointerException("user is null"); //NOI18N
@@ -109,7 +109,7 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteUser: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
 
-		// user should not be null
+		// Validate parameters
 		if (null == user) {
 			// Abort here
 			throw new NullPointerException("user is null"); //NOI18N
diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
index 7888f17..eda7d64 100644
--- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -40,7 +40,6 @@ import org.mxchange.jusercore.exceptions.UserStatusLockedException;
 import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
 import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory;
-import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
 import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote;
 
@@ -73,53 +72,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes
 
 	@Override
 	@SuppressWarnings ("unchecked")
-	public List<User> allMemberPublicVisibleUsers () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMemberPublicVisibleUsers: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get named query
-		final Query query = this.getEntityManager().createNamedQuery("AllMemberPublicUsers", LoginUser.class); //NOI18N
-
-		// Set parameters
-		query.setParameter("status", UserAccountStatus.CONFIRMED); //NOI18N
-		query.setParameter("members", ProfileMode.MEMBERS); //NOI18N
-		query.setParameter("public", ProfileMode.PUBLIC); //NOI18N
-
-		// Get result
-		final List<User> users = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMemberPublicVisibleUsers: users.size()={1} - EXIT!", this.getClass().getSimpleName(), users.size())); //NOI18N
-
-		// Return full list
-		return users;
-	}
-
-	@Override
-	@SuppressWarnings ("unchecked")
-	public List<User> allPublicUsers () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allPublicUsers: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get named query
-		final Query query = this.getEntityManager().createNamedQuery("AllPublicUsers", LoginUser.class); //NOI18N
-
-		// Set parameters
-		query.setParameter("status", UserAccountStatus.CONFIRMED); //NOI18N
-		query.setParameter("mode", ProfileMode.PUBLIC); //NOI18N
-
-		// Get result
-		final List<User> users = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allPublicUsers: users.size()={1} - EXIT!", this.getClass().getSimpleName(), users.size())); //NOI18N
-
-		// Return full list
-		return users;
-	}
-
-	@Override
-	@SuppressWarnings ("unchecked")
+	@Deprecated
 	public List<String> allUserNames () {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserNameList: CALLED!", this.getClass().getSimpleName())); //NOI18N
@@ -207,6 +160,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes
 	}
 
 	@Override
+	@Deprecated
 	public User fillUserData (final User user) throws UserNotFoundException {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fillUserData: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
@@ -253,6 +207,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes
 	}
 
 	@Override
+	@Deprecated
 	public String generateRandomUserName () {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.generateRandomUserName - CALLED!", this.getClass().getSimpleName())); //NOI18N
@@ -277,25 +232,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes
 	}
 
 	@Override
-	@SuppressWarnings ("unchecked")
-	public List<String> getEmailAddressList () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get query
-		final Query query = this.getEntityManager().createNamedQuery("AllEmailAddresses", String.class); //NOI18N
-
-		// Get result list
-		final List<String> emailAddressList = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: emailAddressList.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddressList.size())); //NOI18N
-
-		// Return it
-		return emailAddressList;
-	}
-
-	@Override
+	@Deprecated
 	public boolean ifUserExists (final User user) {
 		// Trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.ifUserExists: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
diff --git a/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java b/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java
index 192b0e7..de7c9a6 100644
--- a/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2017 Roland Haeder<roland@mxchange.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,136 +16,148 @@
  */
 package org.mxchange.jusercore.model.user.activity;
 
-import java.io.Serializable;
 import java.text.MessageFormat;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
+import java.util.List;
+import javax.ejb.EJBException;
+import javax.ejb.Stateless;
 import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
+import javax.persistence.Query;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
 
 /**
- * A message-driven bean for adding user activity log
+ * A stateless, session-scoped EJB for user-activity
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@MessageDriven (
-		name = "userActivityLog",
-		description = "A message-driven bean for adding user activity log",
-		activationConfig = {
-			@ActivationConfigProperty (
-					propertyName = "destinationLookup",
-					propertyValue = "jms/jjobs-user-activity-log"
-			),
-			@ActivationConfigProperty (
-					propertyName = "destinationType",
-					propertyValue = "javax.jms.Queue"
-			)
-		}
-)
-public class JobsUserActivityLogMessageBean extends BaseJobsDatabaseBean implements MessageListener {
+@Stateless (name = "userActivity", description = "A stateless, session-scored user-activity bean.")
+public class JobsUserActivitySessionBean extends BaseJobsDatabaseBean implements UserActivityLogSessionBeanRemote {
 
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 14_920_686_785_732_054L;
+	private static final long serialVersionUID = 1_268_376_401_659L;
 
 	/**
 	 * Default constructor
 	 */
-	public JobsUserActivityLogMessageBean () {
-		// Call super constructor
-		super();
+	public JobsUserActivitySessionBean () {
+		// Invoke super constructor
+		super("jms/jjobs-queue-factory", "jms/jjobs-user-activity-log"); //NOI18N
 	}
 
 	@Override
-	public void onMessage (final Message message) {
+	public void addUserActivityLog (final LogableUserActivity userActivity) {
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage: message={1} - CALLED!", this.getClass().getSimpleName(), message)); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addUserActivityLog: userActivity={1} - CALLED!", this.getClass().getSimpleName(), userActivity)); //NOI18N
 
-		// The parameter should be valid
-		if (null == message) {
+		// Validate parameter
+		if (null == userActivity) {
+			// Throw NPE
+			throw new NullPointerException("userActivity is null"); //NOI18N
+		} else if (userActivity.getActivityContactFamilyName() == null) {
+			// Throw it again
+			throw new NullPointerException("userActivity.activityContactFamilyName is null"); //NOI18N
+		} else if (userActivity.getActivityContactFamilyName().isEmpty()) {
+			// Throw IAE
+			throw new IllegalArgumentException("userActivity.activityContactFamilyName is empty"); //NOI18N
+		} else if (userActivity.getActivityContactFirstName() == null) {
+			// Throw NPE
+			throw new NullPointerException("userActivity.activityContactFirstName is null"); //NOI18N
+		} else if (userActivity.getActivityContactFirstName().isEmpty()) {
+			// Throw IAE
+			throw new IllegalArgumentException("userActivity.activityContactFirstName is empty"); //NOI18N
+		} else if (userActivity.getActivityContactPersonalTitle() == null) {
 			// Throw NPE
-			throw new NullPointerException("message is null"); //NOI18N
-		} else if (!(message instanceof ObjectMessage)) {
-			// Not implementing right interface
-			throw new IllegalArgumentException(MessageFormat.format("message={0} does not implemented ObjectMessage", message)); //NOI18N
+			throw new NullPointerException("userActivity.activityContactPersonalTitle is null"); //NOI18N
+		} else if ((userActivity.getActivityMessage() != null) && (userActivity.getActivityMessage().isEmpty())) {
+			// Throw IAE
+			throw new IllegalArgumentException("userActivity.activityMessage is empty"); //NOI18N
+		} else if (userActivity.getActivityType() == null) {
+			// Throw NPE
+			throw new NullPointerException("userActivity.activityType is null"); //NOI18N
+		} else if (userActivity.getActivityType().isEmpty()) {
+			// Throw IAE
+			throw new IllegalArgumentException("userActivity.activityType is empty"); //NOI18N
+		} else if (userActivity.getActivityUserName() == null) {
+			// Throw NPE
+			throw new NullPointerException("userActivity.activityUserName is null"); //NOI18N
+		} else if (userActivity.getActivityUserName().isEmpty()) {
+			// Throw IAE
+			throw new IllegalArgumentException("userActivity.activityUserName is empty"); //NOI18N
+		} else if (userActivity.getActivityId() != null) {
+			// Throw it again
+			throw new IllegalArgumentException("userActivity.activityId should never be set."); //NOI18N
 		}
 
-		// Securely cast it
-		final ObjectMessage objectMessage = (ObjectMessage) message;
-
-		// Init variable
-		final Serializable serializable;
-
 		try {
-			// Get object from message
-			serializable = objectMessage.getObject();
+			// Send out email change
+			final ObjectMessage message = this.getSession().createObjectMessage();
+			message.setObject(userActivity);
+
+			// Send message
+			this.sendMessage(message);
 		} catch (final JMSException ex) {
-			// Log it and don't continue any further
-			this.getLoggerBeanLocal().logException(ex);
-			return;
+			// Throw again
+			throw new EJBException(ex);
 		}
 
-		// Debug message
-		this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.onMessage: serializable={1}", this.getClass().getSimpleName(), serializable)); //NOI18N
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addUserActivityLog: EXIT!", this.getClass().getSimpleName())); //NOI18N
+	}
 
-		// Okay, is it the right interface?
-		if (null == serializable) {
-			// Throw NPE
-			throw new NullPointerException("serializable is null"); //NOI18N
-		} else if (!(serializable instanceof LogableUserActivity)) {
-			// Not correct object send
-			throw new IllegalArgumentException(MessageFormat.format("serializable={0} does not implement LogableUserActivity", serializable)); //NOI18N
-		}
+	@Override
+	@SuppressWarnings ("unchecked")
+	public List<LogableUserActivity> fetchAllUserActivityLog () {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fetchAllUserActivityLog: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
-		// Securely cast it
-		final LogableUserActivity userActivity = (LogableUserActivity) serializable;
+		// Get named query
+		final Query query = this.getEntityManager().createNamedQuery("AllUserActivityLog"); //NOI18N
 
-		// Should be valid
-		if (null == userActivity) {
-			// Throw NPE
-			throw new NullPointerException("userActivity is null"); //NOI18N
-		} else if (userActivity.getActivityId() instanceof Long) {
-			// Id number should not be set
-			throw new IllegalArgumentException(MessageFormat.format("userActivity.activityId={0} should be null", userActivity.getActivityId())); //NOI18N
-		} else if (userActivity.getActivityUser() == null) {
-			// Throw NPE again
-			throw new NullPointerException("userActivity.activityUser is null"); //NOI18N
-		} else if (userActivity.getActivityUser().getUserId() == null) {
-			// Throw NPE again
-			throw new NullPointerException("userActivity.activityUser.userId is null"); //NOI18N
-		} else if (userActivity.getActivityUser().getUserId() < 1) {
-			// Throw NPE again
-			throw new IllegalArgumentException(MessageFormat.format("userActivity.activityUser.userId={0}  is not valid", userActivity.getActivityUser().getUserId())); //NOI18N
-		} else if (userActivity.getActivityType() == null) {
-			// Throw again ...
-			throw new NullPointerException("userActivity.activityType is null"); //NOI18N
-		} else if (userActivity.getActivityType().isEmpty()) {
-			// Empty type
-			throw new IllegalArgumentException("userActivity.activityType is empty"); //NOI18N
-		} else if ((userActivity.getActivityMessage() instanceof String) && (userActivity.getActivityMessage().isEmpty())) {
-			// Set but empty message
-			throw new IllegalArgumentException("userActivity.activityMessage is empty"); //NOI18N
-		} else if (userActivity.getActivityTimestamp() == null) {
-			// Throw NPE again
-			throw new NullPointerException("userActivity.activityTimestamp is null"); //NOI18N
+		// Get list from it
+		List<LogableUserActivity> list = query.getResultList();
+
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fetchAllUserActivityLog: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+		// Return it
+		return list;
+	}
+
+	@Override
+	@SuppressWarnings ("unchecked")
+	public List<LogableUserActivity> fetchAllUsersActivityLog (final User user) {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fetchAllUsersActivityLog: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+		// Validate parameters
+		if (null == user) {
+			// Abort here
+			throw new NullPointerException("user is null"); //NOI18N
+		} else if (user.getUserId() == null) {
+			// Id is set
+			throw new NullPointerException("user.userId is null"); //NOI18N
+		} else if (user.getUserId() < 1) {
+			// Not valid id number
+			throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
 		}
 
-		// Make user instance managed
-		final User managedUser = this.createManaged(userActivity.getActivityUser());
+		// Get named query
+		final Query query = this.getEntityManager().createNamedQuery("SearchAllUsersActivity"); //NOI18N
 
-		// Set it back
-		userActivity.setActivityUser(managedUser);
+		// Set parameter
+		query.setParameter("activityUser", user); //NOI18N
 
-		// All fine, persist it
-		this.getEntityManager().persist(userActivity);
+		// Get list from it
+		List<LogableUserActivity> list = query.getResultList();
 
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage: EXIT!", this.getClass().getSimpleName())); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fetchAllUsersActivityLog: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+		// Return it
+		return list;
 	}
 
 }
diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java
index 9fc05f6..9e5610f 100644
--- a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/jusercore/model/user/password_history/JobsUserPasswordHistorySessionBean.java b/src/java/org/mxchange/jusercore/model/user/password_history/JobsUserPasswordHistorySessionBean.java
index cbc9c9e..24081d7 100644
--- a/src/java/org/mxchange/jusercore/model/user/password_history/JobsUserPasswordHistorySessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/password_history/JobsUserPasswordHistorySessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java
index 65b6d1e..4dfd1f2 100644
--- a/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java
+++ b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -95,6 +95,7 @@ public class JobsUserLoginSessionBean extends BaseJobsDatabaseBean implements Us
 		}
 
 		// Get user instance from persistance
+		// @TODO Rewrite this to use JCache instead
 		final User updatedUser = this.userBean.fillUserData(container.getUser());
 
 		// Debug message
diff --git a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java
index a09c73a..6fd5fa1 100644
--- a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java
+++ b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java
index 31f4f5f..d252b23 100644
--- a/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java
+++ b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
-- 
2.39.5