Added const & readonly to fields