Added support for final fields in immutable classes