Re-Added BillSafe module