DEVIDM-65 - Refactoring & fixes for the CardInfo service