made some fields final