Feature/en 1889

It looks like this attribute should be final or private if the internal class is the only one setting or using it.