creditcard compatibility optimization & composer/modman refinement