Changed classes to public