Made some fields final