Moved generic code from End Point classes to BaseEndPoint.java