Refactored transactional package -> richwps.