Changing fields to final