Added real payment day support