Changed most field to public