Hidden unnecessary public fields
Basic support for plurals
Remove unnecessary exported fields