Changed several fields to be final.