Adding BaseDS as public, too