Added "final" to some fields.