Changed template classes to be public by default