It seems the fields in the above two classes could be final.