Changes in Payment class