Added varargs and reduced unecessarily public classes to package private.