Changes to make client support non paid pandoa: