made some more collection fields final on the beans.