I do see your point.  There are more fields that belong to a specific payment type.  It is making me reconsider the class design - but not the database design.  I'll give it some thought, but is it okay to make the change in a separate PR?