Made some fields protected