Refactor commerce integration and support more dibs params