Added PayPoint support