Changed to public classes