Made fields final where possible