adapt to current connector implementation
Merge remote-tracking branch 'origin/master'
add billing function
Merge remote-tracking branch 'origin/master'